aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaturneric <[email protected]>2022-04-10 08:53:30 +0000
committerSaturneric <[email protected]>2022-04-10 10:23:41 +0000
commit2daab5b8f2984f3f6f53e4a049ae23a3797eda49 (patch)
tree7d5a205677740bd13338ea2a6244c6b3a7c3900f
parentfix(project): remove automatic build (diff)
downloadGpgFrontend-2daab5b8f2984f3f6f53e4a049ae23a3797eda49.tar.gz
GpgFrontend-2daab5b8f2984f3f6f53e4a049ae23a3797eda49.zip
fix(ci): fix ci config
1. release 2. linux deb 3. change to macOS 11
-rw-r--r--.github/workflows/release-deb-package.yml2
-rw-r--r--.github/workflows/release.yml20
2 files changed, 11 insertions, 11 deletions
diff --git a/.github/workflows/release-deb-package.yml b/.github/workflows/release-deb-package.yml
index ea6869f6..f2f52548 100644
--- a/.github/workflows/release-deb-package.yml
+++ b/.github/workflows/release-deb-package.yml
@@ -39,7 +39,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo qt5-default ninja-build
- sudo apt-get -y install gcc g++ libconfig++-dev libboost-all-dev
+ sudo apt-get -y install gcc g++ libconfig++-dev libboost-all-dev libarchive-dev
sudo apt-get -y install gpg
if: matrix.os == 'ubuntu-20.04'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7ec2a2ab..ed11417d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,14 +23,14 @@ jobs:
build:
strategy:
matrix:
- os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2019' ]
+ os: [ 'ubuntu-18.04', 'macos-11', 'windows-2019' ]
runs-on: ${{ matrix.os }}
steps:
- name: Set git to use LF(Windows) or CRLF(MacOS) line endings
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-11'
- uses: actions/checkout@v2
with:
@@ -64,7 +64,7 @@ jobs:
security import certificate.p12 -k build.keychain -P ${{secrets.MAOS_CERTIFICATE_PWD}} -T /usr/bin/codesign
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k gpgfrontend build.keychain
security set-keychain-settings -lut 3600
- if: matrix.os == 'macos-10.15'
+ if: matrix.os == 'macos-11'
- name: Install Dependence (macOS)
run: |
@@ -73,7 +73,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-11'
- name: Cache Qt
id: cache-qt
@@ -126,7 +126,7 @@ jobs:
run: |
cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DOPENSSL_ROOT_DIR=/usr/local/opt/[email protected]
cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v
- if: matrix.os == 'macos-10.15'
+ if: matrix.os == 'macos-11'
- name: Build & Sign App Bundle (macOS)
run: |
@@ -134,7 +134,7 @@ jobs:
macdeployqt ${{github.workspace}}/build/release/GpgFrontend.app
codesign --deep --force --options=runtime -s "Developer ID Application: Yu Hu (4279AWUL3X)" ${{github.workspace}}/build/release/GpgFrontend.app -v
mkdir ${{github.workspace}}/build/tmp/
- if: matrix.os == 'macos-10.15'
+ if: matrix.os == 'macos-11'
- name: Package & Sign App Bundle (macOS)
run: |
@@ -144,12 +144,12 @@ jobs:
hdiutil convert ${{github.workspace}}/build/tmp/tmp.dmg -format UDZO -o ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg
codesign -s "Developer ID Application: Yu Hu (4279AWUL3X)" ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg
mv ${{github.workspace}}/build/artifactOut/GpgFrontend.dmg ${{github.workspace}}/build/artifactOut/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.dmg
- if: matrix.os == 'macos-10.15'
+ if: matrix.os == 'macos-11'
- name: Notarize Release Build (macOS)
run: |
- xcrun altool --notarize-app -f ${{github.workspace}}/build/artifactOut/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.dmg a
- if: matrix.os == 'macos-10.15'
+ xcrun altool --notarize-app -f ${{github.workspace}}/build/artifactOut/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.dmg --primary-bundle-id pub.gpgfrontend.gpgfrontend -u ${{secrets.APPLE_DEVELOPER_ID}} -p ${{secrets.APPLE_DEVELOPER_ID_SECRET}}
+ if: matrix.os == 'macos-11'
- name: Package App Image (Linux)
run: |
@@ -182,7 +182,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-11'
- name: Upload Artifact(Windows)
uses: actions/upload-artifact@master