diff options
| author | Saturneric <[email protected]> | 2021-12-13 11:25:15 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2021-12-13 11:25:15 +0000 |
| commit | 6d05e4a062e260fb9e73e317ae72ca4d5f33e329 (patch) | |
| tree | b78c90604cb3fb4f433f5c8f43e4cc6b4704e5c3 | |
| parent | Add Stable Restart from Exception Function (diff) | |
| parent | Update CI (diff) | |
| download | GpgFrontend-6d05e4a062e260fb9e73e317ae72ca4d5f33e329.tar.gz GpgFrontend-6d05e4a062e260fb9e73e317ae72ca4d5f33e329.zip | |
Merge branch 'develop-ci' into develop-ui
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/debug.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/release-ci.yml | 11 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index b468761c..b88b607e 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -92,8 +92,9 @@ jobs: - name: Set up Dependence (Windows) shell: msys2 {0} run: | - pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf automake mingw-w64-x86_64-qt-creator mingw-w64-x86_64-gpgme + pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf automake mingw-w64-x86_64-gpgme pacman --noconfirm -S --needed make texinfo mingw-w64-x86_64-libconfig mingw-w64-x86_64-boost mingw-w64-x86_64-gnupg gettext-devel libintl msys2-runtime-devel + pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 if: matrix.os == 'windows-latest' - name: Build gpg-error (Linux) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 92a12869..13e4b733 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -2,19 +2,21 @@ name: Build & Package CI Test on: push: - branches: [develop-ci] + branches: [ develop-ci ] paths-ignore: - "**/README.md" - "**/README_CN.md" - "resource/ts/**" - "docs/**" + - "**.md" pull_request: - branches: [develop-ci] + branches: [ develop-ci ] paths-ignore: - "**/README.md" - "**/README_CN.md" - "resource/ts/**" - "docs/**" + - "**.md" env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) @@ -25,7 +27,7 @@ jobs: build: strategy: matrix: - os: ["ubuntu-18.04", "macos-10.15", "windows-latest"] + os: [ "ubuntu-18.04", "macos-10.15", "windows-latest" ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 @@ -92,8 +94,9 @@ jobs: - name: Set up Dependence (Windows) shell: msys2 {0} run: | - pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf automake mingw-w64-x86_64-qt-creator mingw-w64-x86_64-gpgme + pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf automake mingw-w64-x86_64-gpgme pacman --noconfirm -S --needed make texinfo mingw-w64-x86_64-libconfig mingw-w64-x86_64-boost mingw-w64-x86_64-gnupg gettext-devel libintl msys2-runtime-devel + pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 if: matrix.os == 'windows-latest' - name: Build gpg-error (Linux) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c707ac2a..187b2399 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -93,8 +93,9 @@ jobs: - name: Set up Dependence (Windows) shell: msys2 {0} run: | - pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf automake mingw-w64-x86_64-qt-creator mingw-w64-x86_64-gpgme + pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf automake mingw-w64-x86_64-gpgme pacman --noconfirm -S --needed make texinfo mingw-w64-x86_64-libconfig mingw-w64-x86_64-boost mingw-w64-x86_64-gnupg gettext-devel libintl msys2-runtime-devel + pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 if: matrix.os == 'windows-latest' - name: Build gpg-error (Linux) |