Skip to content

Commit

Permalink
Try another way to generate version string
Browse files Browse the repository at this point in the history
Signed-off-by: Steve Cassidy <steve.cassidy@mq.edu.au>
  • Loading branch information
stevecassidy committed Aug 21, 2024
1 parent 54a63fa commit 3ea3c22
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/nightly-android-testbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ jobs:
strategy:
matrix:
node-version: ['20']
outputs:
prnum: ${{ steps.prnum.outputs.value }}
steps:
- name: Configure Turborepo Remote Cache
run: |
Expand Down Expand Up @@ -69,11 +67,12 @@ jobs:
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Get PR Number
id: prnum
- name: Declare some variables
shell: bash
run: |
echo -n "value=$(app/bin/getDescribeString.sh gh-play)" >> "$GITHUB_OUTPUT"
shell: bash
echo "sha_short=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
echo "app_version=$(npm pkg get version --workspace=@faims3/app | head -1 | sed -e's/\"//g')" >> "$GITHUB_ENV"
echo "version_string=v${{env.app_version}}-android-#${{env.sha_short}}" >> "$GITHUB_ENV"
# https://docs.github.com/en/free-pro-team@latest/actions/guides/building-and-testing-java-with-gradle
- name: Cache Gradle packages
uses: actions/cache@v3
Expand Down Expand Up @@ -120,7 +119,7 @@ jobs:
export platform="github-actions-play"
export serverprefix="testing"
export VITE_CLUSTER_ADMIN_GROUP_NAME=cluster-admin
export VITE_COMMIT_VERSION=$(app/bin/getDescribeString.sh android)
export VITE_COMMIT_VERSION=${{env.version_string}}
export VITE_SHOW_WIPE=true
export VITE_SHOW_MINIFAUXTON=true
export VITE_CONDUCTOR_URL=https://conductor.testing.fieldmark.app
Expand Down Expand Up @@ -148,7 +147,7 @@ jobs:
JAVA_KEY_PASSWORD: ${{ secrets.JAVA_KEY_PASSWORD }}
ANDROID_JSON_KEY_FILE: ${{ steps.service_account_json_file.outputs.filePath }}
serverprefix: "testing"
prnum: ${{steps.prnum.outputs.value}}
prnum: ${{env.version_string}}
# - run: cd android && ./gradlew assembleDebug
- name: Upload build artifacts
uses: actions/upload-artifact@v3
Expand Down

0 comments on commit 3ea3c22

Please sign in to comment.