From dff9a4c2659b45d0ec98cc0848da8fc1e49a1fa5 Mon Sep 17 00:00:00 2001
From: RoiArthurB <contact@arthurbrugiere.fr>
Date: Tue, 5 Oct 2021 10:27:39 +0700
Subject: [PATCH] [MAC] Fix missing entitlements file

---
 .github/workflows/github-travis.yml | 8 +++++++-
 travis/mac-sign.sh                  | 8 +++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/github-travis.yml b/.github/workflows/github-travis.yml
index 5cbe1f393a..94923e94ff 100644
--- a/.github/workflows/github-travis.yml
+++ b/.github/workflows/github-travis.yml
@@ -63,7 +63,9 @@ jobs:
 
       # cf https://github.com/actions/upload-artifact/issues/246
       - name: Move artefacts to root tree
-        run: mv ${{ github.workspace }}/ummisco.gama.product/target/products/Gama*zip ${{ github.workspace }}
+        run: |
+          mv ${{ github.workspace }}/ummisco.gama.product/target/products/Gama*zip ${{ github.workspace }}
+          mv ${{ github.workspace }}/ummisco.gama.product/extraresources/entitlements.plist ${{ github.workspace }}
 
       - uses: actions/upload-artifact@v2
         if: env.CONTINUE == 'true'
@@ -120,6 +122,8 @@ jobs:
           NOTARY_APPLE_ID: ${{ secrets.NOTARY_APPLE_ID }}
           NOTARY_PASSWORD: ${{ secrets.NOTARY_PASSWORD }}
           NOTARY_TEAM_ID: ${{ secrets.NOTARY_TEAM_ID }}
+          # Scripts
+          GITHUB_WORKSPACE: ${{ github.workspace }}
         run: |
           # Unlock
           security unlock-keychain -p "$MACOS_KEYCHAIN_PWD" build.keychain
@@ -144,6 +148,8 @@ jobs:
           NOTARY_APPLE_ID: ${{ secrets.NOTARY_APPLE_ID }}
           NOTARY_PASSWORD: ${{ secrets.NOTARY_PASSWORD }}
           NOTARY_TEAM_ID: ${{ secrets.NOTARY_TEAM_ID }}
+          # Scripts
+          GITHUB_WORKSPACE: ${{ github.workspace }}
         run: |
           # Unlock
           security unlock-keychain -p "$MACOS_KEYCHAIN_PWD" build.keychain
diff --git a/travis/mac-sign.sh b/travis/mac-sign.sh
index 700fa15ad0..f80e161305 100644
--- a/travis/mac-sign.sh
+++ b/travis/mac-sign.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-IDENTITY=""
-
 function signInJar(){
     local f
 
@@ -23,7 +21,7 @@ function signInJar(){
             cd ".." && rm -fr "_sub"
         else
             codesign --remove-signature -v "$f"
-            codesign --timestamp --force -s "$IDENTITY" -v "$f"
+            codesign --timestamp --force -s "$MACOS_DEV_ID" -v "$f"
             echo "---"
         fi
 
@@ -45,7 +43,7 @@ done < jarlist.txt
 
 # Sign single lib files
 find ./ \( -name "*dylib" -o -name "*.so" -o -name "*.jnilib" \) -exec codesign --remove-signature -v {} \;
-find ./ \( -name "*dylib" -o -name "*.so" -o -name "*.jnilib" \) -exec codesign --timestamp --force -s "$IDENTITY" -v {} \;
+find ./ \( -name "*dylib" -o -name "*.so" -o -name "*.jnilib" \) -exec codesign --timestamp --force -s "$MACOS_DEV_ID" -v {} \;
 
 # Sign GAMA compiled file
-codesign --entitlements "$GITHUB_WORKSPACE/ummisco.gama.product/extraresources/entitlements.plist" --timestamp --options=runtime --force -s "$IDENTITY" -v ./Gama.app/Contents/MacOS/Gama
\ No newline at end of file
+codesign --entitlements "$GITHUB_WORKSPACE/artifacts/entitlements.plist" --timestamp --options=runtime --force -s "$MACOS_DEV_ID" -v ./Gama.app/Contents/MacOS/Gama
\ No newline at end of file