From d188e968c67725978b58f3034e79ca132b1750d8 Mon Sep 17 00:00:00 2001
From: tt2468 <tt2468@gmail.com>
Date: Thu, 11 Aug 2022 20:54:50 -0700
Subject: [PATCH] CI: Update again with fixed secret names and a few new
commits
---
.github/scripts/check-cmake.sh | 1 +
.github/scripts/check-format.sh | 1 +
.github/workflows/main.yml | 27 ++++++++++-----------------
3 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/.github/scripts/check-cmake.sh b/.github/scripts/check-cmake.sh
index 0bfc55f6..3b081e76 100755
--- a/.github/scripts/check-cmake.sh
+++ b/.github/scripts/check-cmake.sh
@@ -37,6 +37,7 @@ fi
find . -type d \( \
-path ./\*build -o \
+ -path ./release -o \
-path ./deps \
\) -prune -false -type f -o \
-name 'CMakeLists.txt' -or \
diff --git a/.github/scripts/check-format.sh b/.github/scripts/check-format.sh
index dd21112f..f56f27b6 100755
--- a/.github/scripts/check-format.sh
+++ b/.github/scripts/check-format.sh
@@ -43,6 +43,7 @@ fi
find . -type d \( \
-path ./\*build -o \
+ -path ./release -o \
-path ./cmake -o \
-path ./deps \
\) -prune -false -type f -o \
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0bb76dd2..77f898ca 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -88,8 +88,8 @@ jobs:
print '::endgroup::'
print '::group::Set up code signing'
- if [[ '${{ secrets.MACOS_SIGNING_IDENTITY }}' != '' && \
- '${{ secrets.MACOS_INSTALLER_IDENTITY }}' != '' && \
+ if [[ '${{ secrets.MACOS_SIGNING_APPLICATION_IDENTITY }}' != '' && \
+ '${{ secrets.MACOS_SIGNING_INSTALLER_IDENTITY }}' != '' && \
'${{ secrets.MACOS_SIGNING_CERT }}' != '' ]] {
print '::set-output name=haveCodesignIdent::true'
} else {
@@ -137,8 +137,8 @@ jobs:
- name: Set Signing Identity
if: ${{ github.event_name != 'pull_request' && steps.setup.outputs.haveCodesignIdent == 'true' }}
run: |
- print "CODESIGN_IDENT=${{ secrets.MACOS_SIGNING_IDENTITY }}" >> $GITHUB_ENV
- print "CODESIGN_IDENT_INSTALLER=${{ secrets.MACOS_INSTALLER_IDENTITY }}" >> $GITHUB_ENV
+ print "CODESIGN_IDENT=${{ secrets.MACOS_SIGNING_APPLICATION_IDENTITY }}" >> $GITHUB_ENV
+ print "CODESIGN_IDENT_INSTALLER=${{ secrets.MACOS_SIGNING_INSTALLER_IDENTITY }}" >> $GITHUB_ENV
- name: Build Plugin
uses: ./plugin/.github/actions/build-plugin
@@ -343,7 +343,6 @@ jobs:
name: ${{ env.PLUGIN_NAME }}-windows-${{ matrix.arch }}-${{ steps.setup.outputs.commitHash }}-installer
path: ${{ github.workspace }}/plugin/release/${{ env.PLUGIN_NAME }}-*.exe
-
make-release:
name: 03 - Create and upload release
runs-on: ubuntu-22.04
@@ -358,8 +357,6 @@ jobs:
run: |
## METADATA SCRIPT
echo "::set-output name=version::${GITHUB_REF/refs\/tags\//}"
- echo "::set-output name=date::$(date +"%Y-%m-%d")"
- echo '::set-output name=commitHash::${{ needs.macos_build.outputs.commitHash }}'
- name: Download build artifacts
uses: actions/download-artifact@v3
@@ -378,16 +375,12 @@ jobs:
uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5
with:
draft: true
- prerelease: false
+ prerelease: ${{ contains(steps.metadata.outputs.version, 'rc') || contains(steps.metadata.outputs.version, 'beta') }}
tag_name: ${{ steps.metadata.outputs.version }}
- name: "${{ env.PLUGIN_NAME }} Build ${{ steps.metadata.outputs.version }}"
+ name: "${{ env.PLUGIN_NAME }} ${{ steps.metadata.outputs.version }}"
body_path: ${{ github.workspace }}/CHECKSUMS.txt
files: |
- ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x64-${{ steps.metadata.outputs.commitHash }}/*.zip
- ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x64-${{ steps.metadata.outputs.commitHash }}-installer/*.exe
- ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x86-${{ steps.metadata.outputs.commitHash }}/*.zip
- ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-windows-x86-${{ steps.metadata.outputs.commitHash }}-installer/*.exe
- ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-linux-x86_64-${{ steps.metadata.outputs.commitHash }}/*.deb
- ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-macos-x86_64-${{ steps.metadata.outputs.commitHash }}/*.pkg
- ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-macos-arm64-${{ steps.metadata.outputs.commitHash }}/*.pkg
- ${{ github.workspace }}/${{ env.PLUGIN_NAME }}-macos-universal-${{ steps.metadata.outputs.commitHash }}/*.pkg
+ ${{ github.workspace }}/**/*.zip
+ ${{ github.workspace }}/**/*.exe
+ ${{ github.workspace }}/**/*.deb
+ ${{ github.workspace }}/**/*.pkg