Skip to content

Commit 7510b06

Browse files
committed
Revert "Disable all workflows, but the app build for mac, and make it upload to release anyways"
This reverts commit 76ffef6.
1 parent 4ed3f1f commit 7510b06

File tree

8 files changed

+31
-32
lines changed

8 files changed

+31
-32
lines changed

.github/workflows/app_build.yml

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: C++ CI for OpenStudioApplication
22

33
on:
44
push:
5-
branches: [ master, develop, codesigning ]
5+
branches: [ master, develop ]
66
# Sequence of patterns matched against refs/tags
77
tags:
88
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
@@ -32,36 +32,35 @@ jobs:
3232
# fail-fast: Default is true, switch to false to allow one platform to fail and still run others
3333
fail-fast: false
3434
matrix:
35-
# os: [ubuntu-20.04, ubuntu-22.04, windows-2022, macos-13, macos-arm64]
36-
os: [macos-13, macos-arm64]
35+
os: [ubuntu-20.04, ubuntu-22.04, windows-2022, macos-13, macos-arm64]
3736
include:
38-
# - os: ubuntu-20.04
39-
# SELF_HOSTED: false
40-
# PLATFORM_NAME: Linux
41-
# BINARY_EXT: deb
42-
# COMPRESSED_EXT: tar.gz
43-
# BINARY_PKG_PATH: _CPack_Packages/Linux/DEB
44-
# COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ
45-
# QT_OS_NAME: linux
46-
# QT_ARCH: gcc_64
47-
# - os: ubuntu-22.04
48-
# SELF_HOSTED: false
49-
# PLATFORM_NAME: Linux
50-
# BINARY_EXT: deb
51-
# COMPRESSED_EXT: tar.gz
52-
# BINARY_PKG_PATH: _CPack_Packages/Linux/DEB
53-
# COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ
54-
# QT_OS_NAME: linux
55-
# QT_ARCH: gcc_64
56-
# - os: windows-2022
57-
# SELF_HOSTED: false
58-
# PLATFORM_NAME: Windows
59-
# BINARY_EXT: exe
60-
# COMPRESSED_EXT: zip
61-
# BINARY_PKG_PATH: _CPack_Packages/win64/IFW
62-
# COMPRESSED_PKG_PATH: _CPack_Packages/win64/ZIP
63-
# QT_OS_NAME: windows
64-
# QT_ARCH: win64_msvc2019_64
37+
- os: ubuntu-20.04
38+
SELF_HOSTED: false
39+
PLATFORM_NAME: Linux
40+
BINARY_EXT: deb
41+
COMPRESSED_EXT: tar.gz
42+
BINARY_PKG_PATH: _CPack_Packages/Linux/DEB
43+
COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ
44+
QT_OS_NAME: linux
45+
QT_ARCH: gcc_64
46+
- os: ubuntu-22.04
47+
SELF_HOSTED: false
48+
PLATFORM_NAME: Linux
49+
BINARY_EXT: deb
50+
COMPRESSED_EXT: tar.gz
51+
BINARY_PKG_PATH: _CPack_Packages/Linux/DEB
52+
COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ
53+
QT_OS_NAME: linux
54+
QT_ARCH: gcc_64
55+
- os: windows-2022
56+
SELF_HOSTED: false
57+
PLATFORM_NAME: Windows
58+
BINARY_EXT: exe
59+
COMPRESSED_EXT: zip
60+
BINARY_PKG_PATH: _CPack_Packages/win64/IFW
61+
COMPRESSED_PKG_PATH: _CPack_Packages/win64/ZIP
62+
QT_OS_NAME: windows
63+
QT_ARCH: win64_msvc2019_64
6564
- os: macos-13
6665
SELF_HOSTED: false
6766
PLATFORM_NAME: Darwin
@@ -670,7 +669,7 @@ jobs:
670669
path: build/bench_results_*.csv
671670

672671
- name: Upload Binary installer to release
673-
# if: contains(github.ref, 'refs/tags')
672+
if: contains(github.ref, 'refs/tags')
674673
uses: svenstaro/upload-release-action@v2
675674
with:
676675
repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -680,7 +679,7 @@ jobs:
680679
file_glob: true
681680

682681
- name: Upload TGZ or ZIP to release
683-
# if: contains(github.ref, 'refs/tags')
682+
if: contains(github.ref, 'refs/tags')
684683
uses: svenstaro/upload-release-action@v2
685684
with:
686685
repo_token: ${{ secrets.GITHUB_TOKEN }}
File renamed without changes.

0 commit comments

Comments
 (0)