Skip to content

Commit

Permalink
Merge branch 'develop' into fhenneke_multiple_ssh
Browse files Browse the repository at this point in the history
* develop: (62 commits)
  Scroll to files and enter folders when created (android-password-store#909)
  Run a treewide reformat (android-password-store#908)
  Improve how secrets and stored and used (android-password-store#907)
  Improve and refactor Autofill heuristics (android-password-store#905)
  Use PreferenceKeys file to manage SharedPreferences keys. (android-password-store#891)
  Revert "Support directly importing secrets" (android-password-store#904)
  Allow importing TOTP configuration through QR codes (android-password-store#903)
  Bump version
  Prepare release 1.9.2
  update changelog
  Workaround to prevent crash on first run (android-password-store#898)
  Workaround to prevent crash on first run (android-password-store#898)
  Offer TOTP Autofill for OTP fields (android-password-store#899)
  Merge SshKeyGenFragment into its activity (android-password-store#897)
  Reintroduce TOTP support (android-password-store#890)
  Sync with release branch (android-password-store#896)
  build: bump version
  Prepare release 1.9.1
  Backport Actions fixes (android-password-store#894)
  Rework GitHub Actions (android-password-store#893)
  ...
  • Loading branch information
msfjarvis committed Jul 1, 2020
2 parents 545e4e7 + 1c9f797 commit 41f92b1
Show file tree
Hide file tree
Showing 100 changed files with 2,623 additions and 1,462 deletions.
72 changes: 0 additions & 72 deletions .github/workflows/branch_deploy.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/deploy_snapshot.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- develop

name: Deploy snapshot builds
jobs:
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/draft_new_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: "Draft new release"

on:
milestone:
types: [closed]

jobs:
draft-new-release:
name: "Draft a new release"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: 'release'
- name: Extract version from milestone
run: |
VERSION="${{ github.event.milestone.title }}"
echo "::set-env name=RELEASE_VERSION::$VERSION"
- name: Create release branch
run: git checkout -b release-${{ env.RELEASE_VERSION }}

- name: Update changelog
uses: thomaseizinger/keep-a-changelog-new-release@1.1.0
with:
version: ${{ env.RELEASE_VERSION }}

- name: Initialize git config
run: |
git config user.name "GitHub Actions"
git config user.email noreply@github.com
- name: Commit changelog
run: |
git add CHANGELOG.md
git commit --message "Prepare release ${{ env.RELEASE_VERSION }}"
- name: Push new branch
run: git push origin release-${{ env.RELEASE_VERSION }}

- name: Create pull request
uses: thomaseizinger/create-pull-request@1.0.0
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
head: release-${{ env.RELEASE_VERSION }}
base: release
title: Release ${{ env.RELEASE_VERSION }}
8 changes: 4 additions & 4 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
api-level: [23, 29, 30]
api-level: [23, 29]
variant: [Debug, Release]
steps:

Expand All @@ -22,7 +22,7 @@ jobs:
pull_number: context.payload.number,
per_page: 100
})
const serviceChanged = result.data.filter(f => f.filename.startsWith("app/") || f.filename.endsWith("gradle") || f.filename.startsWith(".github") || f.filename.startsWith("gradle") || f.filename.endsWith("properties")).length > 0
const serviceChanged = result.data.filter(f => f.filename.startsWith("app/") || f.filename.endsWith("gradle") || f.filename.startsWith(".github/workflows/pull_request.yml") || f.filename.startsWith("gradle") || f.filename.endsWith("properties")).length > 0
console.log(serviceChanged)
return serviceChanged
Expand Down Expand Up @@ -71,10 +71,10 @@ jobs:

- name: Run instrumentation tests
if: ${{ steps.service-changed.outputs.result == 'true' }}
uses: reactivecircus/android-emulator-runner@v2.10.0
uses: reactivecircus/android-emulator-runner@v2.11.0
with:
api-level: ${{ matrix.api-level }}
target: google_apis
target: default
script: |
adb shell settings put global animator_duration_scale 0
adb shell settings put global transition_animation_scale 0
Expand Down
133 changes: 133 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
name: Release
on:
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'

jobs:
build:
name: Build release binaries
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v1

- name: Decrypt secrets
run: release/signing-setup.sh "$ENCRYPT_KEY"
env:
ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}

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

- name: Generate cache key
run: ./.github/checksum.sh checksum.txt

- name: Cache gradle modules
uses: actions/cache@v1
with:
path: ~/.gradle/caches/modules-2
key: ${{ runner.os }}-gradlemodules-${{ hashFiles('checksum.txt') }}
restore-keys: |
${{ runner.os }}-gradlemodules-
- name: Cache gradle jars
uses: actions/cache@v1
with:
path: ~/.gradle/caches/jars-3
key: ${{ runner.os }}-gradlejars-${{ hashFiles('checksum.txt') }}
restore-keys: |
${{ runner.os }}-gradlejars-
- name: Cache gradle build
uses: actions/cache@v1
with:
path: ~/.gradle/caches/build-cache-1
key: ${{ runner.os }}-gradlebuildcache-${{ hashFiles('checksum.txt') }}
restore-keys: |
${{ runner.os }}-gradlebuildcache-
- name: Download gradle dependencies
run: ./gradlew dependencies

- name: Build release APK and bundle
run: ./gradlew :app:assembleRelease :app:bundleRelease

- name: Upload release APK
uses: actions/upload-artifact@master
with:
name: APS Release APK
path: app/build/outputs/apk/release/app-release.apk

- name: Upload release Bundle
uses: actions/upload-artifact@master
with:
name: APS Release Bundle
path: app/build/outputs/bundle/release/app-release.aab

- name: Clean secrets
if: always()
run: release/signing-cleanup.sh

create_github_release:
name: Create GitHub Release
runs-on: ubuntu-latest
needs: build
steps:
- name: Checkout
uses: actions/checkout@v1

- name: Get APK
uses: actions/download-artifact@v1
with:
name: APS Release APK
path: artifacts

- name: Get Bundle
uses: actions/download-artifact@v1
with:
name: APS Release Bundle
path: artifacts

- name: Get Changelog Entry
id: changelog_reader
uses: mindsers/changelog-reader-action@v1.1.0
with:
version: ${{ github.ref }}
path: ./CHANGELOG.md

- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: ${{ github.ref }}
body: ${{ steps.changelog_reader.outputs.log_entry }}
draft: false
prerelease: false

- name: Get the version
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}

- name: Upload Release Apk
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./artifacts/app-release.apk
asset_name: APS_${{ steps.get_version.outputs.VERSION }}.apk
asset_content_type: application/vnd.android.package-archive

- name: Upload Release Bundle
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./artifacts/app-release.aab
asset_name: APS_${{ steps.get_version.outputs.VERSION }}.aab
asset_content_type: application/octet-stream
10 changes: 0 additions & 10 deletions .tx/config

This file was deleted.

Loading

0 comments on commit 41f92b1

Please sign in to comment.