aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaturneric <[email protected]>2022-12-22 08:16:50 +0000
committerSaturneric <[email protected]>2022-12-22 08:16:50 +0000
commit88d82fd0d50dcd63d4bcac368598bab009978dbd (patch)
treefb10ffce8a8786229d0a1fd4e8edf509bbc91332
parentfix: remove myeasylog.log (diff)
downloadGpgFrontend-88d82fd0d50dcd63d4bcac368598bab009978dbd.tar.gz
GpgFrontend-88d82fd0d50dcd63d4bcac368598bab009978dbd.zip
fix(ci): solve issues on ci config file
-rw-r--r--.github/workflows/debug.yml8
-rw-r--r--.github/workflows/release.yml14
2 files changed, 11 insertions, 11 deletions
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index 05add7a5..26bbcad2 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -32,7 +32,7 @@ jobs:
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- if: matrix.os == 'windows-latest' || matrix.os == 'macos-10.15'
+ if: matrix.os == 'windows-latest' || matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
- uses: actions/checkout@v2
with:
@@ -58,7 +58,7 @@ jobs:
brew unlink gettext && brew link --force gettext
brew link qt@5
brew link [email protected] --force
- if: matrix.os == 'macos-10.15'
+ if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
- name: Build gpg-error (Linux)
run: |
@@ -130,7 +130,7 @@ jobs:
run: |
cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON
cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v
- if: matrix.os == 'macos-10.15'
+ if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
- name: Configure CMake & Build Binary(Windows)
shell: msys2 {0}
@@ -158,7 +158,7 @@ jobs:
with:
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
path: ${{github.workspace}}/build/release/*
- if: matrix.os == 'macos-10.15'
+ if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
- name: Upload Artifact(Windows)
uses: actions/upload-artifact@master
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 15e5b298..9fadacde 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- if: matrix.os == 'windows-2019' || matrix.os == 'macos-10.15'
+ if: matrix.os == 'windows-2019' || matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
- uses: actions/checkout@v2
with:
@@ -75,7 +75,7 @@ jobs:
mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
- if: matrix.os == 'macos-10.15'
+ if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
- name: Install Dependence (macOS)
run: |
@@ -84,7 +84,7 @@ jobs:
brew unlink gettext && brew link --force gettext
brew link qt@5
brew link [email protected] --force
- if: matrix.os == 'macos-10.15'
+ if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
- name: Build gpg-error (Linux)
run: |
@@ -169,7 +169,7 @@ jobs:
xcodebuild -exportArchive -archivePath ${{github.workspace}}/build/GpgFrontend.xcarchive \
-exportOptionsPlist ${{github.workspace}}/build/ExportOptions.plist \
-exportPath ${{github.workspace}}/build/package/
- if: matrix.os == 'macos-10.15'
+ if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
- name: Package & Sign App Bundle (macOS)
run: |
@@ -184,7 +184,7 @@ jobs:
${{github.workspace}}/build/artifactOut/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.dmg
mv ${{github.workspace}}/build/GpgFrontend.app.zip \
${{github.workspace}}/build/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.zip
- if: matrix.os == 'macos-10.15'
+ if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
- name: Notarize Release Build (macOS)
run: |
@@ -193,7 +193,7 @@ jobs:
--primary-bundle-id ${{secrets.GPGFRONTEND_XOCDE_APPID}} \
-u ${{secrets.APPLE_DEVELOPER_ID}} \
-p ${{secrets.APPLE_DEVELOPER_ID_SECRET}}
- if: matrix.os == 'macos-10.15'
+ if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
- name: Package App Image (Linux)
run: |
@@ -226,7 +226,7 @@ jobs:
with:
name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
path: ${{github.workspace}}/build/artifactOut/*
- if: matrix.os == 'macos-10.15'
+ if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
- name: Upload Artifact(Windows)
uses: actions/upload-artifact@master