Fix some Publish script issues

juicebox-systems · Jul 20, 2023 · 6584524 · 6584524
1 parent 99118db
commit 6584524
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -28,7 +28,7 @@ jobs:
 
       - name: Publish
         run: >-
-          gradlew clean publish
+          ./gradlew clean publish
           -PossrhUsername="${{ secrets.OSSRH_USERNAME }}"
           -PossrhPassword="${{ secrets.OSSRH_PASSWORD }}"
           -PsigningPassword="${{ secrets.ANDROID_SIGNING_PASSWORD }}"
@@ -69,7 +69,7 @@ jobs:
       - name: Publish
         run: |
           cp ../README.md .
-          sed -i '' 's/juicebox-sdk-wasm/juicebox-sdk/' package.json
+          sed -i 's/juicebox-sdk-wasm/juicebox-sdk/' package.json
           npm publish
         working-directory: javascript/juicebox-sdk
         env:
@@ -89,6 +89,9 @@ jobs:
         uses: Swatinem/rust-cache@v2
 
       - name: Publish
-        run: pod trunk push --verbose --allow-warnings
+        run: |
+          eval `ssh-agent -s`
+          ssh-add - <<< "${{ secrets.ACCESS_KEY }}"
+          pod trunk push --verbose --allow-warnings
         env:
           COCOAPODS_TRUNK_TOKEN: "${{ secrets.COCOAPODS_TRUNK_TOKEN }}"
diff --git a/android/build.gradle b/android/build.gradle
@@ -67,7 +67,7 @@ preBuild {
 
 def getVersionName() {
     try {
-        return hasProperty('version') ? version : 'git describe --tags --exact-match'.execute().text.trim()
+        return hasProperty('versionString') ? versionString : 'git describe --tags --exact-match'.execute().text.trim()
     } catch (Exception e) {
         throw new GradleException("Git tag not found. Please make sure you have tagged your commit.")
     }