Skip to content

Commit 5499baa

Browse files
committed
simplifies action
1 parent 4b84a8d commit 5499baa

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

.github/workflows/reusable_build_sample_apps.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
fetch-depth: 0 # Workaround for bug https://github.com/actions/checkout/issues/1471
4343

4444
- name: Set IS_PRIMARY_APP
45+
shell: bash
4546
run: |
4647
if [[ "${{ matrix.sample-app }}" == "java_layout" ]]; then
4748
echo "IS_PRIMARY_APP=true" >> $GITHUB_ENV
@@ -74,13 +75,6 @@ jobs:
7475
# Export the groups as an environment variable
7576
echo "firebase_distribution_groups=$(IFS=','; echo "${distribution_groups[*]}")" >> $GITHUB_ENV
7677
77-
- name: Get latest SDK version
78-
if: ${{ inputs.use_latest_sdk_version == true }}
79-
id: latest-sdk-version-step
80-
run: |
81-
latest_tag=$(git describe --tags --abbrev=0)
82-
echo "LATEST_TAG=$latest_tag" >> "$GITHUB_OUTPUT"
83-
8478
- uses: ./.github/actions/setup-android
8579

8680
# CLI to replace strings in files. The CLI recommends using `cargo install` which is slow. This Action is fast because it downloads pre-built binaries.
@@ -94,11 +88,14 @@ jobs:
9488
ruby-version: '3.0'
9589
bundler-cache: true # cache tools to make builds faster in future
9690

97-
- name: Set Git Context Variables
91+
- name: Capture Git Context
92+
shell: bash
93+
id: git-context
9894
run: |
9995
echo "BRANCH_NAME=${{ github.head_ref || github.ref_name }}" >> $GITHUB_ENV
10096
COMMIT_HASH="${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}"
10197
echo "COMMIT_HASH=${COMMIT_HASH:0:7}" >> $GITHUB_ENV
98+
echo "LATEST_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
10299
103100
- name: Setup local.properties file for sample app
104101
run: |
@@ -109,11 +106,11 @@ jobs:
109106
echo "workspace=${{ matrix.cio-workspace-name }}" >> "$LOCAL_PROPS_FILE"
110107
echo "branchName=${{ env.BRANCH_NAME }}" >> "$LOCAL_PROPS_FILE"
111108
echo "commitHash=${{ env.COMMIT_HASH }}" >> "$LOCAL_PROPS_FILE"
112-
LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "untagged")
109+
LAST_TAG="${{ env.LATEST_TAG :- "untagged" }}"
113110
COMMITS_AHEAD=$(git rev-list $LAST_TAG..HEAD --count 2>/dev/null || echo "untracked")
114111
echo "commitsAheadCount=$COMMITS_AHEAD" >> "$LOCAL_PROPS_FILE"
115112
if [ "${{ inputs.use_latest_sdk_version == true }}" ]; then
116-
echo "sdkVersion=${{ steps.latest-sdk-version-step.outputs.LATEST_TAG }}" >> "$LOCAL_PROPS_FILE"
113+
echo "sdkVersion=${{ env.LATEST_TAG }}" >> "$LOCAL_PROPS_FILE"
117114
fi
118115
119116
- name: Dump GitHub Action metadata because Fastlane uses it. Viewing it here helps debug JSON parsing code in Firebase.
@@ -122,7 +119,7 @@ jobs:
122119
- name: Prepare Fastlane Build Arguments
123120
run: |
124121
if [ "${{ inputs.use_latest_sdk_version }}" = "true" ]; then
125-
sdk_version="\"sdk_version\":\"${{ steps.latest-sdk-version-step.outputs.LATEST_TAG }}\""
122+
sdk_version="\"sdk_version\":\"${{ env.LATEST_TAG }}\""
126123
else
127124
sdk_version=""
128125
fi
@@ -152,11 +149,13 @@ jobs:
152149
FIREBASE_APP_DISTRIBUTION_SERVICE_ACCOUNT_CREDS_B64: ${{ secrets.FIREBASE_APP_DISTRIBUTION_SERVICE_ACCOUNT_CREDS_B64 }}
153150

154151
- name: Determine SDK Version
152+
shell: bash
155153
id: determine-sdk-version
156154
run: |
157-
sdk_version="${{ env.SDK_VERSION || steps.latest-sdk-version-step.outputs.LATEST_TAG }}"
158-
echo "Final SDK Version: $sdk_version"
159-
echo "SDK_VERSION=$sdk_version" >> $GITHUB_ENV
155+
sdk_version="${{ env.SDK_VERSION }}"
156+
sdk_version="${sdk_version:-${{ env.LATEST_TAG }}}"
157+
echo "SDK Version used in app build: $sdk_version"
158+
echo "APP_SDK_BUILD_VERSION=$sdk_version" >> $GITHUB_ENV
160159
161160
- name: Send Slack Notification for Sample App Builds
162161
if: always() && env.IS_PRIMARY_APP == 'true'
@@ -172,7 +171,7 @@ jobs:
172171
instructions_guide_link: ${{ secrets.SAMPLE_APPS_INSTRUCTIONS_GUIDE_LINK }}
173172
platform: "android"
174173
sdk_name: "Android Native SDK"
175-
sdk_version: ${{ env.SDK_VERSION }}
174+
sdk_version: ${{ env.APP_SDK_BUILD_VERSION }}
176175
slack_webhook_url: ${{ secrets.SLACK_NOTIFY_RELEASES_WEBHOOK_URL }}
177176

178177
- name: Update sample builds PR comment with build information

0 commit comments

Comments
 (0)