adjust mac build script again

Bible-Translation-Tools · Jan 7, 2025 · 3c5eab7 · 3c5eab7
1 parent 7dd041f
commit 3c5eab7
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 49 deletions.
diff --git a/.github/workflows/mac_store_build.yml b/.github/workflows/mac_store_build.yml
@@ -16,21 +16,11 @@ jobs:
       - name: set version var for tags and update path for releases
         id: tagged
         run: |
-          echo "GHA_VERSION=${{ steps.semver_parser.outputs.fullversion }}$GITHUB_RUN_NUMBER" >> $GITHUB_ENV && \
+          echo "GHA_VERSION=${{ steps.semver_parser.outputs.fullversion }}" >> $GITHUB_ENV && \
           echo "UPDATE_PATH=release" >> $GITHUB_ENV && \
           echo "PRERELEASE_BOOL=false" >> $GITHUB_ENV
-        if: contains( github.ref, 'refs/tags/v' )
-      - name: If this is a tagged pre-release build set pre-release label and update path
-        id: prerelease
-        run: |
-          echo "PRERELEASE_BOOL=true" >> $GITHUB_ENV && \
-          echo "UPDATE_PATH=pre-release-updates/${{ steps.semver_parser.outputs.prerelease }}" >> $GITHUB_ENV
-        if: ${{ steps.semver_parser.outputs.prerelease }}
-      - name: set version var for not-tags and upload dir for branches
-        run: |
-          echo "GHA_VERSION=$(cat VERSION)$GITHUB_RUN_NUMBER" >> $GITHUB_ENV && \
-          echo "UPDATE_PATH=$CI_REF_NAME_SLUG" >> $GITHUB_ENV
-        if: ${{ steps.tagged.outcome == 'skipped' }}
+        # todo reenable once tested:
+        # if: contains( github.ref, 'refs/tags/v' )
       - name: set s3 destination_dir
         run: echo "S3_DESTINATION=$CI_REPOSITORY_OWNER/$CI_REPOSITORY_NAME/$UPDATE_PATH" >> $GITHUB_ENV
       - name: output env vars
@@ -125,38 +115,35 @@ jobs:
           name: upload-binaries
           include-hidden-files: true
           path: jvm/workbookapp/.exec/
-  upload:
-    runs-on: ubuntu-20.04
-    needs: [set-env-vars, build]
-    steps:
-      - name: Set upload secrets
-        uses: 1password/load-secrets-action@v2
-        with:
-          export-env: true
-        env:
-          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-          AWS_KEY_ID: "op://DevOps/travis-nightlybuilds aws s3 api access for travis uploads/S3_ACCESS_KEY_ID"
-          AWS_SECRET_ACCESS_KEY: "op://DevOps/travis-nightlybuilds aws s3 api access for travis uploads/S3_SECRET_ACCESS_KEY"
-          AWS_BUCKET: "op://DevOps/travis-nightlybuilds aws s3 api access for travis uploads/S3_BUCKET"
-      - name: download artifacts from previous job
-        uses: actions/download-artifact@v4
-        with:
-          name: upload-binaries
-          include-hidden-files: true
-          path: ${{ github.workspace }}/binaries
-      - name: upload
-        if: github.event_name != 'pull_request'
-        run: |
-          AWS_DEFAULT_REGION=us-east-1 AWS_ACCESS_KEY_ID=${{env.AWS_KEY_ID}} AWS_SECRET_ACCESS_KEY=${{env.AWS_SECRET_ACCESS_KEY}} aws s3 sync . s3://${{ env.AWS_BUCKET }}/${{ needs.set-env-vars.outputs.S3_DESTINATION }}
-        working-directory: ${{ github.workspace }}/binaries
-      - name: upload artifacts to github releases on tags
-        uses: "marvinpinto/[email protected]"
-        if: contains( github.ref, 'refs/tags/v' )
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          prerelease: ${{ needs.set-env-vars.outputs.PRERELEASE_BOOL }}
-          files: |
-            ${{ github.workspace }}/binaries/*.exe
-            ${{ github.workspace }}/binaries/*.deb
-            ${{ github.workspace }}/binaries/*.dmg
-            ${{ github.workspace }}/binaries/*.pkg
+  # upload:
+  #   runs-on: ubuntu-20.04
+  #   needs: [set-env-vars, build]
+  #   steps:
+  #     - name: Set upload secrets
+  #       uses: 1password/load-secrets-action@v2
+  #       with:
+  #         export-env: true
+  #       env:
+  #         OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
+  #         AWS_KEY_ID: "op://DevOps/travis-nightlybuilds aws s3 api access for travis uploads/S3_ACCESS_KEY_ID"
+  #         AWS_SECRET_ACCESS_KEY: "op://DevOps/travis-nightlybuilds aws s3 api access for travis uploads/S3_SECRET_ACCESS_KEY"
+  #         AWS_BUCKET: "op://DevOps/travis-nightlybuilds aws s3 api access for travis uploads/S3_BUCKET"
+  #     - name: download artifacts from previous job
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: upload-binaries
+  #         include-hidden-files: true
+  #         path: ${{ github.workspace }}/binaries
+  #     - name: upload
+  #       if: github.event_name != 'pull_request'
+  #       run: |
+  #         AWS_DEFAULT_REGION=us-east-1 AWS_ACCESS_KEY_ID=${{env.AWS_KEY_ID}} AWS_SECRET_ACCESS_KEY=${{env.AWS_SECRET_ACCESS_KEY}} aws s3 sync . s3://${{ env.AWS_BUCKET }}/${{ needs.set-env-vars.outputs.S3_DESTINATION }}
+  #       working-directory: ${{ github.workspace }}/binaries
+  #     - name: upload artifacts to github releases on tags
+  #       uses: "marvinpinto/[email protected]"
+  #       if: contains( github.ref, 'refs/tags/v' )
+  #       with:
+  #         repo_token: "${{ secrets.GITHUB_TOKEN }}"
+  #         prerelease: ${{ needs.set-env-vars.outputs.PRERELEASE_BOOL }}
+  #         files: |
+  #           ${{ github.workspace }}/binaries/*.pkg
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.2902
+3.1.2903