Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: typos in compatrelease artifacts (WPB-8645) #3303

Merged
merged 1 commit into from
Aug 9, 2024
Merged

fix: typos in compatrelease artifacts (WPB-8645) #3303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-fdroid-app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
run: chmod +x ./gradlew
- name: build prod flavour APK
run:
./gradlew app:assembleFdroidCompatRelease
./gradlew app:assembleFdroidCompatrelease
env:
KEYSTORE_FILE_PATH_DEBUG: ${{ vars.KEYSTORE_FILE_PATH }}
KEYSTORE_FILE_PATH_RELEASE: ${{ vars.KEYSTORE_FILE_PATH }}
Expand Down
32 changes: 10 additions & 22 deletions .github/workflows/build-prod-app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,11 @@ jobs:
needs: [ code-analysis, ui-tests, unit-tests ]
runs-on: ubuntu-latest
steps:
- name: Verify release target commit
id: verify_commit
run: |
release_commit=$(git rev-parse ${{ github.event.release.target_commitish }})
prod_commit=$(git rev-parse refs/heads/prod)

if [[ "$release_commit" != "$prod_commit" ]]; then
echo "Error: The commit associated with the release tag is not the same as the HEAD of the prod branch."
exit 1
fi

- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive # Needed in order to fetch Kalium sources for building
fetch-depth: 0
- name: Get latest release tag
id: get_latest_release
run: |
Expand All @@ -49,12 +43,6 @@ jobs:
else
echo "Current tag ($current_tag) is equal or higher than latest tag ($latest_tag). Continuing the workflow."
fi

- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive # Needed in order to fetch Kalium sources for building
fetch-depth: 0
- name: Set up JDK 17
uses: buildjet/setup-java@v4
with:
Expand All @@ -72,7 +60,7 @@ jobs:
run: chmod +x ./gradlew
- name: build prod flavour APK
run:
./gradlew app:assembleProdCompatRelease
./gradlew app:assembleProdCompatrelease
env:
KEYSTORE_FILE_PATH_DEBUG: ${{ vars.KEYSTORE_FILE_PATH }}
KEYSTORE_FILE_PATH_RELEASE: ${{ vars.KEYSTORE_FILE_PATH }}
Expand All @@ -84,7 +72,7 @@ jobs:
ENABLE_SIGNING: ${{ secrets.ENABLE_SIGNING }}
- name: build prod flavour bundle
run:
./gradlew app:bundleProdCompatRelease
./gradlew app:bundleProdCompatrelease
env:
KEYSTORE_FILE_PATH_DEBUG: ${{ vars.KEYSTORE_FILE_PATH }}
KEYSTORE_FILE_PATH_RELEASE: ${{ vars.KEYSTORE_FILE_PATH }}
Expand All @@ -107,7 +95,7 @@ jobs:
with:
serviceAccountJson: service_account.json
packageName: com.wire
releaseFiles: app/build/outputs/bundle/prodCompatRelease/*.aab
releaseFiles: app/build/outputs/bundle/prodCompatrelease/*.aab
track: Alpha
- name: Deploy ProdCompatRelease to S3
uses: ./.github/actions/deploy-to-s3
Expand All @@ -119,6 +107,6 @@ jobs:
build-flavour: prod
build-variant: compatrelease
- name: Attach APK to release
uses: softprops/[email protected].7
uses: softprops/[email protected].8
with:
files: app/build/outputs/apk/prodCompatRelease/*.apk
files: app/build/outputs/apk/prodCompatrelease/*.apk
Loading