diff options
| -rw-r--r-- | .github/ISSUE_TEMPLATE/feature_request.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/codeql_analysis.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/deploy_github_releases.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/deploy_library_releases.yml | 21 | ||||
| -rw-r--r-- | .github/workflows/deploy_snapshot.yml | 49 | ||||
| -rw-r--r-- | .github/workflows/pull_request.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/shadow_job.yml | 70 | ||||
| -rw-r--r-- | .github/workflows/sync_crowdin.yml | 37 | ||||
| -rw-r--r-- | .github/workflows/update_publicsuffix_data.yml | 4 |
9 files changed, 12 insertions, 189 deletions
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 9cb96f5b..b1adfd3f 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -8,7 +8,7 @@ body: value: | Thanks for taking the time to file this issue! Here are a few things to check before clicking the submit button :) 1. Make sure you're on the latest version of the app. Features are being added all the time and it is entirely possible what you're requesting has already been added. The current release can be found here: https://github.com/android-password-store/android-password-store/releases/latest. - 2. Check the changelog file to confirm that the feature hasn't been added for an upcoming release: https://github.com/android-password-store/Android-Password-Store/blob/develop/CHANGELOG.md + 2. Check the changelog file to confirm that the feature hasn't been added for an upcoming release: https://github.com/danixland/Android-Password-Store/blob/master/CHANGELOG.md 3. ALWAYS fill this template. If you fail to do so, your issue will be immediately closed with no response. Maintaining open source projects for free is hard work, and we expect users to respect that time and effort by putting in a little bit of their own. A feature request that is clear and explicit in its needs lets us get to work faster. - type: textarea diff --git a/.github/workflows/codeql_analysis.yml b/.github/workflows/codeql_analysis.yml index 0a90695f..61e11fdd 100644 --- a/.github/workflows/codeql_analysis.yml +++ b/.github/workflows/codeql_analysis.yml @@ -4,10 +4,10 @@ on: workflow_dispatch: # push: # branches: - # - develop + # - master # pull_request: # branches: - # - develop + # - master env: SENTRY_DSN: 'https://public_key@example.com/project_id' @@ -22,7 +22,7 @@ jobs: security-events: write steps: - name: Setup build environment - uses: android-password-store/android-password-store/.github/reusable-workflows/setup-gradle@develop + uses: danixland/Android-Password-Store/.github/reusable-workflows/setup-gradle@master - name: Initialize CodeQL uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12 diff --git a/.github/workflows/deploy_github_releases.yml b/.github/workflows/deploy_github_releases.yml index f88f4451..8dbdbcf5 100644 --- a/.github/workflows/deploy_github_releases.yml +++ b/.github/workflows/deploy_github_releases.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup build environment - uses: android-password-store/android-password-store/.github/reusable-workflows/setup-gradle@develop + uses: danixland/Android-Password-Store/.github/reusable-workflows/setup-gradle@master - name: Decrypt secrets shell: bash diff --git a/.github/workflows/deploy_library_releases.yml b/.github/workflows/deploy_library_releases.yml deleted file mode 100644 index cdb1a211..00000000 --- a/.github/workflows/deploy_library_releases.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Release library subprojects -on: - push: - tags: - - autofill-parser-v* - -jobs: - publish-release: - runs-on: ubuntu-latest - steps: - - name: Setup build environment - uses: android-password-store/android-password-store/.github/reusable-workflows/setup-gradle@develop - - - name: Upload binaries - shell: bash - run: ./gradlew --no-configuration-cache :autofill-parser:publishAllPublicationsToMavenCentralRepository - env: - ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.NEXUS_PUBLISH_USERNAME }} - ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.NEXUS_PUBLISH_PASSWORD }} - ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.NEXUS_PUBLISH_GPG_KEY }} - ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.NEXUS_PUBLISH_GPG_KEY_PASSWORD }} diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml deleted file mode 100644 index ccfea2d6..00000000 --- a/.github/workflows/deploy_snapshot.yml +++ /dev/null @@ -1,49 +0,0 @@ -on: - push: - branches: - - develop - -permissions: - contents: write - actions: write - -# There should only be one instance of this -concurrency: - group: ${{ github.workflow }} - cancel-in-progress: true - -name: Deploy snapshot builds -jobs: - deploy-release-snapshot: - runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, '[ci skip]')" - steps: - - name: Setup build environment - uses: android-password-store/android-password-store/.github/reusable-workflows/setup-gradle@develop - with: - fetch-depth: 0 - dependency-graph: generate-and-submit - - - name: Decrypt secrets - shell: bash - run: scripts/signing-setup.sh "$ENCRYPT_KEY" - env: - ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }} - - - name: Build release app - shell: bash - run: ./gradlew collectFreeReleaseApks collectNonFreeReleaseApks bundleFreeRelease bundleNonFreeRelease -PsentryUploadMappings - env: - SNAPSHOT: "true" - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - - - name: Clean secrets - shell: bash - run: scripts/signing-cleanup.sh - - - name: Deploy snapshot - shell: bash - run: scripts/deploy-snapshot.sh - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 48f171cf..1522b1d4 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup build environment - uses: android-password-store/android-password-store/.github/reusable-workflows/setup-gradle@develop + uses: danixland/Android-Password-Store/.github/reusable-workflows/setup-gradle@master - name: Check codestyle shell: bash @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup build environment - uses: android-password-store/android-password-store/.github/reusable-workflows/setup-gradle@develop + uses: danixland/Android-Password-Store/.github/reusable-workflows/setup-gradle@master - name: Run unit tests shell: bash @@ -57,7 +57,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup build environment - uses: android-password-store/android-password-store/.github/reusable-workflows/setup-gradle@develop + uses: danixland/Android-Password-Store/.github/reusable-workflows/setup-gradle@master - name: Build debug APKs shell: bash @@ -74,7 +74,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup build environment - uses: android-password-store/android-password-store/.github/reusable-workflows/setup-gradle@develop + uses: danixland/Android-Password-Store/.github/reusable-workflows/setup-gradle@master - name: Check library API shell: bash @@ -91,7 +91,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup build environment - uses: android-password-store/android-password-store/.github/reusable-workflows/setup-gradle@develop + uses: danixland/Android-Password-Store/.github/reusable-workflows/setup-gradle@master - name: Run Lint shell: bash diff --git a/.github/workflows/shadow_job.yml b/.github/workflows/shadow_job.yml deleted file mode 100644 index df343471..00000000 --- a/.github/workflows/shadow_job.yml +++ /dev/null @@ -1,70 +0,0 @@ -on: - workflow_dispatch: - schedule: - - cron: '0 12 * * 1' - -env: - SENTRY_DSN: 'https://public_key@example.com/project_id' - -name: Shadow job -jobs: - provide-agp-version-matrix: - runs-on: ubuntu-latest - outputs: - agp-versions: ${{ steps.build-agp-matrix.outputs.agp-versions }} - steps: - - id: agp-version-finder - uses: usefulness/agp-version-finder-action@aecea9c2f6cb188f39f5512d1d2e0bd4afda89e1 # v1 - - id: build-agp-matrix - shell: bash - run: echo 'agp-versions=["${{ steps.agp-version-finder.outputs.latest-beta }}","${{ steps.agp-version-finder.outputs.latest-alpha }}"]' >> $GITHUB_OUTPUT - - shadow-job: - needs: [provide-agp-version-matrix] - strategy: - fail-fast: false - matrix: - agp-version: ${{ fromJSON(needs.provide-agp-version-matrix.outputs.agp-versions) }} - gradle-version: - - wrapper - - release-nightly - - nightly - java-version: - - 20 - runs-on: ubuntu-latest - name: Run Gradle-${{ matrix.gradle-version }}, AGP-${{ matrix.agp-version }}, Java-${{ matrix.java-version }} - steps: - - name: Setup build environment - uses: android-password-store/android-password-store/.github/reusable-workflows/setup-gradle@develop - with: - cache-read-only: true - gradle-version: ${{ matrix.gradle-version }} - java-version: ${{ matrix.java-version }} - - - name: Run checks - shell: bash - run: ./gradlew check - env: - DEP_OVERRIDE: true - DEP_OVERRIDE_agp: ${{ matrix.agp-version }} - - results: - if: ${{ always() }} - runs-on: ubuntu-latest - name: Final Results - needs: [shadow-job] - steps: - - name: Report failure to healthchecks.io - # see https://stackoverflow.com/a/67532120/4907315 - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }} - shell: bash - run: curl --retry 3 "https://hc-ping.com/${HC_PING_SLUG}/fail" - env: - HC_PING_SLUG: ${{ secrets.HC_PING_SLUG }} - - - name: Report success to healthchecks.io - if: ${{ contains(needs.*.result, 'success') }} - shell: bash - run: curl --retry 3 "https://hc-ping.com/${HC_PING_SLUG}" - env: - HC_PING_SLUG: ${{ secrets.HC_PING_SLUG }} diff --git a/.github/workflows/sync_crowdin.yml b/.github/workflows/sync_crowdin.yml deleted file mode 100644 index 6b5810ab..00000000 --- a/.github/workflows/sync_crowdin.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Sync localisations from Crowdin -on: - workflow_dispatch: - schedule: - - cron: '0 0 * * 0' - -jobs: - sync-crowdin: - runs-on: ubuntu-latest - steps: - - name: Setup build environment - uses: android-password-store/android-password-store/.github/reusable-workflows/setup-gradle@develop - - - name: Sync translations to/from Crowdin - id: crowdin - uses: crowdin/github-action@95d6e895e871c3c7acf0cfb962f296baa41e63c6 # v2 - with: - upload_sources: true - upload_translations: false - download_translations: true - localization_branch_name: l10n_crowdin_translations - create_pull_request: true - pull_request_title: 'New Crowdin Translations' - pull_request_body: 'New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)' - pull_request_base_branch_name: 'develop' - project_id: ${{ secrets.CROWDIN_PROJECT_ID }} - token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} - env: - GITHUB_TOKEN: ${{ secrets.PSL_UPDATE_TOKEN }} - - - name: Enable automerge for PR - shell: bash - run: | - gh pr merge --squash --auto "${PR_URL}" - env: - GITHUB_TOKEN: ${{ secrets.PSL_UPDATE_TOKEN }} - PR_URL: ${{ steps.crowdin.outputs.pull-request-url }} diff --git a/.github/workflows/update_publicsuffix_data.yml b/.github/workflows/update_publicsuffix_data.yml index 9003a60c..257b54fb 100644 --- a/.github/workflows/update_publicsuffix_data.yml +++ b/.github/workflows/update_publicsuffix_data.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup build environment - uses: android-password-store/android-password-store/.github/reusable-workflows/setup-gradle@develop + uses: danixland/Android-Password-Store/.github/reusable-workflows/setup-gradle@master - name: Download new publicsuffix data shell: bash @@ -30,7 +30,7 @@ jobs: if: "${{ env.UPDATED == 'true' }}" with: author: GitHub Actions <noreply@github.com> - base: develop + base: master body: This is an automated pull request to update the publicsuffixes file to the latest copy from Mozilla branch: bot/update-psl commit-message: "autofill-parser: update publicsuffixes file" |