Skip to content

Commit

Permalink
Fix release
Browse files Browse the repository at this point in the history
  • Loading branch information
erikeelde committed Jan 12, 2024
1 parent 91ef196 commit cec504e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
File renamed without changes.
14 changes: 10 additions & 4 deletions .github/workflows/app-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,16 @@ jobs:
echo "${{ secrets.SERVICE_ACCOUNT }}" > service_account.json.asc
gpg -d --passphrase "${{ secrets.GPG_ENCRYPTION_KEY }}" --batch service_account.json.asc > service_account.json
- name: "Calculate build number"
id: version_information
uses: ./.github/actions/version_information

- name: Check out java
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: 17

- name: "Calculate build number"
id: version_information
uses: ./.github/actions/version_information

- name: Copy CI gradle.properties
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

Expand All @@ -51,3 +50,10 @@ jobs:
- name: Publish application
if: github.repository == 'erikeelde/toggles'
run: ./gradlew :toggles-app:publishReleaseBundle

- name: Upload binaries
uses: actions/upload-artifact@v4
with:
name: Apks
path: '**/build/outputs/*'
retention-days: 14
2 changes: 1 addition & 1 deletion scripts/generate_versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ for prefix in "${prefixes[@]}"; do
patch="${version_parts[2]}"

# Calculate the version code using arithmetic expansion
version_code=$((major * 100000 + minor * 1000 + patch * 10))
version_code=$((major * 1000000 + minor * 1000 + patch * 10))

# Get the number of commits since the tag
commit_count=$(git rev-list --count "${tag}"..HEAD)
Expand Down

0 comments on commit cec504e

Please sign in to comment.