Skip to content

Commit a0a9d35

Browse files
adriwebadriweb
committed
tag v2.0 (and temporary CI changes for artifacts)
1 parent 287f5ba commit a0a9d35

File tree

3 files changed

+13
-60
lines changed

3 files changed

+13
-60
lines changed

‎.github/workflows/build.linux.workflow.yml‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ on:
55
branches: [ master, feature/github-actions ]
66
pull_request:
77
branches: [ master, feature/github-actions ]
8-
release:
9-
types: [published]
108

119
jobs:
1210
build:
@@ -57,7 +55,7 @@ jobs:
5755
with:
5856
cmakeListsTxtPath: '${{ github.workspace }}/gui/qt/CMakeLists.txt'
5957
configurePreset: 'Linux-${{ matrix.arch }}-${{ matrix.qtver }}'
60-
configurePresetAdditionalArgs: "['-DDEPS_RELEASE_ONLY=ON', '-DSHORT_VERSION=v2.0']"
58+
configurePresetAdditionalArgs: "['-DDEPS_RELEASE_ONLY=ON', '-DSHORT_VERSION=v2.0', '-DIS_OFFICIAL_RELEASE_VERSION=ON']"
6159
buildPreset: 'Linux-${{ matrix.arch }}-${{ matrix.qtver }}-${{ matrix.config }}'
6260
env:
6361
VCPKG_DEFAULT_HOST_TRIPLET: ${{ matrix.arch }}-linux-${{ matrix.host_triplet }}
@@ -68,17 +66,3 @@ jobs:
6866
with:
6967
name: CEmu_linux_${{ matrix.qtver }}_master
7068
path: ${{ github.workspace }}/gui/qt/CEmu.build/Linux-${{ matrix.arch }}-${{ matrix.qtver }}/${{ matrix.config }}/CEmu
71-
72-
- name: Prepare binary for release upload
73-
run: |
74-
mv ${{ github.workspace }}/gui/qt/CEmu.build/Linux-${{ matrix.arch }}-${{ matrix.qtver }}/${{ matrix.config }}/CEmu ${{ github.workspace }}/CEmu-nightly_linux64_qt6_${{ matrix.release_suffix }}
75-
76-
- name: Update nightly release
77-
if: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}
78-
uses: softprops/action-gh-release@d4e8205d7e959a9107da6396278b2f1f07af0f9b # latest as of 2023-01-13
79-
with:
80-
tag_name: nightly
81-
prerelease: true
82-
token: ${{secrets.GITHUB_TOKEN}}
83-
files: |
84-
${{ github.workspace }}/CEmu-nightly_linux64_qt6_${{ matrix.release_suffix }}

‎.github/workflows/build.mac.workflow.yml‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ on:
55
branches: [ master, feature/github-actions ]
66
pull_request:
77
branches: [ master, feature/github-actions ]
8-
release:
9-
types: [published]
108

119
jobs:
1210
build:
@@ -55,16 +53,16 @@ jobs:
5553
with:
5654
cmakeListsTxtPath: '${{ github.workspace }}/gui/qt/CMakeLists.txt'
5755
configurePreset: 'Mac-${{ matrix.arch }}-${{ matrix.qtver }}'
58-
configurePresetAdditionalArgs: "['-DDEPS_RELEASE_ONLY=ON', '-DSHORT_VERSION=v2.0']"
56+
configurePresetAdditionalArgs: "['-DDEPS_RELEASE_ONLY=ON', '-DSHORT_VERSION=v2.0', '-DIS_OFFICIAL_RELEASE_VERSION=ON']"
5957
buildPreset: 'Mac-${{ matrix.arch }}-${{ matrix.qtver }}-${{ matrix.config }}'
6058
env:
6159
VCPKG_DEFAULT_HOST_TRIPLET: ${{ matrix.arch }}-osx-release
6260
VCPKG_FORCE_SYSTEM_BINARIES: 1
6361

6462
- name: Move to temp folder
6563
run: |
66-
mkdir -p /tmp/CEmu-nightly_mac_qt${{matrix.qtvershort}}/
67-
mv ${{ github.workspace }}/gui/qt/CEmu.build/Mac-${{ matrix.arch }}-${{ matrix.qtver }}/${{ matrix.config }}/CEmu.app /tmp/CEmu-nightly_mac_qt${{matrix.qtvershort}}/
64+
mkdir -p /tmp/CEmu-v2.0_mac_qt${{matrix.qtvershort}}/
65+
mv ${{ github.workspace }}/gui/qt/CEmu.build/Mac-${{ matrix.arch }}-${{ matrix.qtver }}/${{ matrix.config }}/CEmu.app /tmp/CEmu-v2.0_mac_qt${{matrix.qtvershort}}/
6866
6967
- name: "Codesign CEmu.app"
7068
env:
@@ -81,21 +79,21 @@ jobs:
8179
security unlock-keychain -p $MACOS_KEYCHAIN_PWD build.keychain
8280
security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
8381
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $MACOS_KEYCHAIN_PWD build.keychain
84-
/usr/bin/codesign --deep --force --verify --verbose --sign "$MACOS_CODESIGN_IDENT" --timestamp --options runtime /tmp/CEmu-nightly_mac_qt${{matrix.qtvershort}}/CEmu.app
82+
/usr/bin/codesign --deep --force --verify --verbose --sign "$MACOS_CODESIGN_IDENT" --timestamp --options runtime /tmp/CEmu-v2.0_mac_qt${{matrix.qtvershort}}/CEmu.app
8583
8684
- name: "Create the DMG"
8785
run: |
8886
brew install create-dmg || brew install create-dmg; # we try twice because sometimes it fails...
8987
# The codesign variable may be empty (for forks) but that's fine, create-dmg only does code-signing if it's not empty.
9088
createDmgArgs="--codesign '${{ secrets.MACOS_CODESIGN_IDENT }}' \
91-
--volname 'CEmu-nightly Qt${{matrix.qtvershort}}' \
89+
--volname 'CEmu v2.0 Qt${{matrix.qtvershort}}' \
9290
--window-pos 200 120 \
9391
--window-size 600 400 \
9492
--icon-size 64 \
9593
--icon 'CEmu.app' 125 200 \
9694
--app-drop-link 400 200 \
97-
'CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg' \
98-
'/tmp/CEmu-nightly_mac_qt${{matrix.qtvershort}}/'"
95+
'CEmu-v2.0_mac_qt${{matrix.qtvershort}}.dmg' \
96+
'/tmp/CEmu-v2.0_mac_qt${{matrix.qtvershort}}/'"
9997
eval "create-dmg $createDmgArgs" || eval "create-dmg $createDmgArgs" # We also retry just in case...
10098
10199
- name: "[macOS] Notarize and staple DMG"
@@ -107,21 +105,11 @@ jobs:
107105
APPLE_NOTARIZATION_TEAMID: ${{ secrets.APPLE_NOTARIZATION_TEAMID }}
108106
run: |
109107
xcrun notarytool store-credentials "notarytool-profile" --apple-id "$APPLE_NOTARIZATION_USERNAME" --team-id "$APPLE_NOTARIZATION_TEAMID" --password "$APPLE_NOTARIZATION_PASSWORD"
110-
xcrun notarytool submit "CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg" --keychain-profile "notarytool-profile" --wait
111-
xcrun stapler staple "CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg"
108+
xcrun notarytool submit "CEmu-v2.0_mac_qt${{matrix.qtvershort}}.dmg" --keychain-profile "notarytool-profile" --wait
109+
xcrun stapler staple "CEmu-v2.0_mac_qt${{matrix.qtvershort}}.dmg"
112110
113111
- name: Upload dmg as artifact
114112
uses: actions/upload-artifact@v3
115113
with:
116-
name: CEmu-nightly_mac_qt${{matrix.qtvershort}}
117-
path: CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg
118-
119-
- name: Update nightly release
120-
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
121-
uses: softprops/action-gh-release@d4e8205d7e959a9107da6396278b2f1f07af0f9b # latest as of 2023-01-13
122-
with:
123-
tag_name: nightly
124-
prerelease: true
125-
token: ${{secrets.GITHUB_TOKEN}}
126-
files: |
127-
CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg
114+
name: CEmu-v2.0_mac_qt${{matrix.qtvershort}}
115+
path: CEmu-v2.0_mac_qt${{matrix.qtvershort}}.dmg

‎.github/workflows/build.windows.workflow.yml‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ on:
55
branches: [ master, feature/github-actions ]
66
pull_request:
77
branches: [ master, feature/github-actions ]
8-
release:
9-
types: [published]
108

119
jobs:
1210
build:
@@ -53,7 +51,7 @@ jobs:
5351
with:
5452
cmakeListsTxtPath: '${{ github.workspace }}/gui/qt/CMakeLists.txt'
5553
configurePreset: 'Win-${{ matrix.arch }}-${{ matrix.qtver }}'
56-
configurePresetAdditionalArgs: "['-DDEPS_RELEASE_ONLY=ON', '-DSHORT_VERSION=v2.0']"
54+
configurePresetAdditionalArgs: "['-DDEPS_RELEASE_ONLY=ON', '-DSHORT_VERSION=v2.0', '-DIS_OFFICIAL_RELEASE_VERSION=ON']"
5755
buildPreset: 'Win-${{ matrix.arch }}-${{ matrix.qtver }}-${{ matrix.config }}'
5856
env:
5957
VCPKG_DEFAULT_TRIPLET: ${{ matrix.arch }}-windows
@@ -65,20 +63,3 @@ jobs:
6563
with:
6664
name: CEmu_win${{ matrix.arch_suffix }}_${{ matrix.qtver }}_master
6765
path: ${{ github.workspace }}/gui/qt/CEmu.build/Win-${{ matrix.arch }}-${{ matrix.qtver }}/${{ matrix.config }}/CEmu.exe
68-
69-
- name: Prepare binary for release upload
70-
if: ${{ matrix.config == 'Release' }}
71-
run: |
72-
$ReleaseName = "CEmu-nightly_win${{ matrix.arch_suffix }}-msvc_${{ matrix.qtver }}.exe".Replace("Qt", "qt")
73-
Rename-Item -Path "${{ github.workspace }}/gui/qt/CEmu.build/Win-${{ matrix.arch }}-${{ matrix.qtver }}/${{ matrix.config }}/CEmu.exe" -NewName $ReleaseName
74-
echo "RELEASE_NAME=$ReleaseName" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
75-
76-
- name: Update nightly release
77-
if: ${{ matrix.config == 'Release' && github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}
78-
uses: softprops/action-gh-release@d4e8205d7e959a9107da6396278b2f1f07af0f9b # latest as of 2023-01-13
79-
with:
80-
tag_name: nightly
81-
prerelease: true
82-
token: ${{secrets.GITHUB_TOKEN}}
83-
files: |
84-
./gui/qt/CEmu.build/Win-${{ matrix.arch }}-${{ matrix.qtver }}/${{ matrix.config }}/${{ env.RELEASE_NAME }}

0 commit comments

Comments
 (0)