cert sign for mac doesn't work

freekode · Feb 14, 2024 · 2f0ec17 · 2f0ec17
1 parent cd3f3b6
commit 2f0ec17
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 21 deletions.
diff --git a/.github/workflows/build-electron.yml b/.github/workflows/build-electron.yml
@@ -41,13 +41,13 @@ jobs:
           key: ${{ runner.os }}-jdks
 
       - name: Build jar in unix
-        if: ${{ matrix.environment.os != 'windows-latest' }}
+        if: ${{ runner.os != 'Windows' }}
         run: |
           cd ./boot
           ./gradlew build
 
       - name: Build jar in windows
-        if: ${{ matrix.environment.os == 'windows-latest' }}
+        if: ${{ runner.os == 'Windows' }}
         run: |
           cd ./boot
           ./gradlew.bat build
@@ -61,22 +61,8 @@ jobs:
         if: ${{ inputs.dry-run == true }}
         run: npm run build --prefix electron
 
-      - name: Write Mac certificate to a file
-        if: ${{ inputs.dry-run == false && matrix.environment.os == 'macos-latest' }}
-        env:
-          CERTIFICATES_P12: ${{ secrets.CERTIFICATES_P12 }}
-        run: echo "$CERTIFICATES_P12" | base64 --decode > certificates.p12
-
-      - name: Publish electron for Mac
-        if: ${{ inputs.dry-run == false && matrix.environment.os == 'macos-latest' }}
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CSC_LINK: ../certificates.p12
-          CSC_KEY_PASSWORD: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
-        run: npm run publish --prefix electron
-
       - name: Publish electron
-        if: ${{ inputs.dry-run == false && matrix.environment.os != 'macos-latest' }}
+        if: ${{ inputs.dry-run == false }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: npm run publish --prefix electron
@@ -86,6 +72,6 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: tp2intervals-${{ matrix.environment.os }}
+          name: tp2intervals-${{ runner.os }}
           path: electron/dist/tp2intervals*
           if-no-files-found: error
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,8 +1,8 @@
 name: build
 
 on:
-#  push:
-#    branches: [ main ]
+  push:
+    branches: [ main ]
   pull_request:
   workflow_dispatch:
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,13 +2,13 @@ name: release
 
 on:
   push:
-    branches: [ main ]
     tags: [v*]
   workflow_dispatch:
 
 jobs:
   jar:
     uses: ./.github/workflows/build-jar.yml
+    secrets: inherit
     with:
       jar-name: tp2intervals
       jar-artifact-name: tp2intervals-jar
@@ -18,6 +18,7 @@ jobs:
     needs:
       - jar
     uses: ./.github/workflows/build-docker-image.yml
+    secrets: inherit
     with:
       jar-name: tp2intervals
       jar-artifact-name: tp2intervals-jar