Fix paths and env variables

okfn · Jan 17, 2025 · 7eaa50c · 7eaa50c
1 parent ad98794
commit 7eaa50c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/create-dmg.yaml b/.github/workflows/create-dmg.yaml
@@ -18,11 +18,11 @@ jobs:
           brew install create-dmg
       - name: Build and notarize the dmg file
         env:
-          CSC_LINK: ${{ secrets.MAC_P12_BASE64_CERTIFICATE }}
-          CSC_LINK_PASSWORD: ${{ secrets.MAC_P12_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.MAC_TEAM_ID }}
-          APPLE_ID: ${{ secrets.MAC_APPLE_ID }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.MAC_APP_SPECIFIC_PASSWORD }}
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          CSC_LINK_PASSWORD: ${{ secrets.CSC_LINK_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
         run: |
           chmod +x create-dmg.sh
           ./create-dmg.sh

diff --git a/create-dmg.sh b/create-dmg.sh
@@ -31,11 +31,11 @@ security default-keychain -s build.keychain
 security unlock-keychain -p thisisatemporarypass build.keychain
 security import certificate.p12 -k build.keychain -P $CSC_KEY_PASSWORD -T /usr/bin/codesign
 security set-key-partition-list -S apple-tool:,apple:,codedign: -s -k $CSC_KEY_PASSWORD build.keychain
-/usr/bin/codesign --force --deep --options=runtime --entitlements ./packaging/macos/entitlements.mac.plist -s $APPLE_TEAM_ID --timestamp dist/opendataeditor.app
+/usr/bin/codesign --force --deep --options=runtime --entitlements ./packaging/macos/entitlements.mac.plist -s $APPLE_TEAM_ID --timestamp dist/opendataeditor/opendataeditor.app
 
 # Create dmg folder and copy our signed executable
 mkdir -p dist/dmg
-cp "dist/opendataeditor.app" "dist/dmg"
+cp "dist/opendataeditor/opendataeditor.app" "dist/dmg"
 
 # Create the dmg file
 VERSION=$(python -c "import ode; print(ode.__version__)")