From aa2efd4d2f22f22948c33804fa242401c9714a93 Mon Sep 17 00:00:00 2001 From: HeCodes2Much Date: Tue, 9 Jul 2024 12:30:32 +0100 Subject: [PATCH] Testing testing 1 2 3 --- .github/workflows/gitguardian.yaml | 34 ++--- .github/workflows/nightly-release.yml | 197 +++++++++++++------------- 2 files changed, 118 insertions(+), 113 deletions(-) diff --git a/.github/workflows/gitguardian.yaml b/.github/workflows/gitguardian.yaml index 5a2ee08..a9d740a 100644 --- a/.github/workflows/gitguardian.yaml +++ b/.github/workflows/gitguardian.yaml @@ -1,21 +1,21 @@ name: GitGuardian scan -on: [ push, pull_request ] +on: [push, pull_request] jobs: - scanning: - name: GitGuardian scan - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.1.7 - with: - fetch-depth: 0 # fetch all history so multiple commits can be scanned - - name: GitGuardian scan - uses: GitGuardian/ggshield/actions/secret@v1.29.0 - env: - GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }} - GITHUB_PUSH_BASE_SHA: ${{ github.event.base }} - GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }} - GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }} - GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }} + scanning: + name: GitGuardian scan + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4.1.7 + with: + fetch-depth: 0 # fetch all history so multiple commits can be scanned + - name: GitGuardian scan + uses: GitGuardian/ggshield/actions/secret@v1.29.0 + env: + GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }} + GITHUB_PUSH_BASE_SHA: ${{ github.event.base }} + GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }} + GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }} + GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }} diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml index e861ac1..8760f24 100644 --- a/.github/workflows/nightly-release.yml +++ b/.github/workflows/nightly-release.yml @@ -1,114 +1,119 @@ name: Nightly Release on: - schedule: - - cron: '0 0 * * *' # This runs at midnight UTC every day - workflow_dispatch: # This allows the workflow to be triggered manually + schedule: + - cron: "0 0 * * *" # This runs at midnight UTC every day + workflow_dispatch: # This allows the workflow to be triggered manually jobs: - release: - runs-on: ubuntu-latest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - steps: - - name: Check out the repository - uses: actions/checkout@v4.1.7 - - - name: Delete existing nightly release + release: + runs-on: ubuntu-latest env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - release_id=$(curl -sSf -H "Authorization: Bearer $GITHUB_TOKEN" "https://api.github.com/repos/${GITHUB_REPOSITORY}/releases/tags/nightly" | jq -r '.id') - if [ -n "$release_id" ]; then - curl -sSf \ - -H "Authorization: Bearer $GITHUB_TOKEN" \ - -X DELETE \ - "https://api.github.com/repos/${GITHUB_REPOSITORY}/releases/${release_id}" - fi + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - name: Check out the repository + uses: actions/checkout@v4.1.7 - - name: Create new release - uses: actions/create-release@v1.1.4 - with: - tag_name: nightly - release_name: Nightly Build - draft: false - prerelease: true - body: "This is a Nightly build" + - name: Delete existing nightly release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + release_id=$(curl -sSf -H "Authorization: Bearer $GITHUB_TOKEN" "https://api.github.com/repos/${GITHUB_REPOSITORY}/releases/tags/nightly" | jq -r '.id') + if [ -n "$release_id" ]; then + curl -sSf \ + -H "Authorization: Bearer $GITHUB_TOKEN" \ + -X DELETE \ + "https://api.github.com/repos/${GITHUB_REPOSITORY}/releases/${release_id}" + fi - build: - name: Build, Sign & Release - runs-on: ubuntu-latest - needs: release - steps: - - name: Checkout project - uses: actions/checkout@v4.1.7 - with: - token: ${{ secrets.GIT_BOT_TOKEN }} + - name: Create new release + uses: actions/create-release@v1.1.4 + with: + tag_name: nightly + release_name: Nightly Build + draft: false + prerelease: true + body: "This is a Nightly build" - - name: set up JDK 17 - uses: actions/setup-java@v4.2.1 - with: - java-version: '17' - distribution: 'temurin' - cache: gradle + build: + name: Build, Sign & Release + runs-on: ubuntu-latest + needs: release + steps: + - name: Checkout project + uses: actions/checkout@v4.1.7 + with: + token: ${{ secrets.GIT_BOT_TOKEN }} - - uses: actions/cache@v4.0.2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: | - ${{ runner.os }}-gradle- + - name: set up JDK 17 + uses: actions/setup-java@v4.2.1 + with: + java-version: "17" + distribution: "temurin" + cache: gradle - - name: Grant execute permission for gradlew - run: chmod +x gradlew + - uses: actions/cache@v4.0.2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} + restore-keys: | + ${{ runner.os }}-gradle- - - name: Get weather.properties from secrets - run: printf "%s" "${{ secrets.WEATHER_PROPERTIES }}" > $GITHUB_WORKSPACE/weather.properties + - name: Grant execute permission for gradlew + run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew clean && ./gradlew assembleWithInternetRelease && ./gradlew assembleWithoutInternetRelease + - name: Get weather.properties from secrets + run: printf "%s" "${{ secrets.WEATHER_PROPERTIES }}" > $GITHUB_WORKSPACE/weather.properties - - name: Sign APK - WithInternet - uses: ilharp/sign-android-release@v1.0.4 - # ID used to access action output - id: sign_app_withInternet - with: - releaseDir: app/build/outputs/apk/withInternet/release - signingKey: ${{ secrets.SIGNINGKEY_BASE64 }} - keyAlias: ${{ secrets.KEY_ALIAS }} - keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} - keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: 33.0.0 + - name: Build with Gradle + run: ./gradlew clean && ./gradlew assembleWithInternetRelease && ./gradlew assembleWithoutInternetRelease - - name: Release to GitHub - WithInternet - uses: svenstaro/upload-release-action@2.9.0 - with: - repo_token: ${{ secrets.GIT_BOT_TOKEN }} - file: ${{steps.sign_app_withInternet.outputs.signedFile}} - asset_name: EasyLauncher-Internet-Nightly-Signed.apk - tag: nightly - overwrite: true + - name: Sign APK - WithInternet + uses: ilharp/sign-android-release@v1.0.4 + # ID used to access action output + id: sign_app_withInternet + with: + releaseDir: app/build/outputs/apk/withInternet/release + signingKey: ${{ secrets.SIGNINGKEY_BASE64 }} + keyAlias: ${{ secrets.KEY_ALIAS }} + keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} + keyPassword: ${{ secrets.KEY_PASSWORD }} + buildToolsVersion: 33.0.0 - - name: Sign APK - WithoutInternet - uses: ilharp/sign-android-release@v1.0.4 - # ID used to access action output - id: sign_app_withoutInternet - with: - releaseDir: app/build/outputs/apk/withoutInternet/release - signingKey: ${{ secrets.SIGNINGKEY_BASE64 }} - keyAlias: ${{ secrets.KEY_ALIAS }} - keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} - keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: 33.0.0 + - name: Release to GitHub - WithInternet + uses: svenstaro/upload-release-action@2.9.0 + with: + release_name: "Nightly" + repo_token: ${{ secrets.GIT_BOT_TOKEN }} + file: ${{steps.sign_app_withInternet.outputs.signedFile}} + asset_name: EasyLauncher-Internet-Nightly-Signed.apk + tag: nightly + body: "This is a nightly build." + prerelease: true + overwrite: true - - name: Release to GitHub - WithoutInternet - uses: svenstaro/upload-release-action@2.9.0 - with: - repo_token: ${{ secrets.GIT_BOT_TOKEN }} - file: ${{steps.sign_app_withoutInternet.outputs.signedFile}} - asset_name: EasyLauncher-Nightly-Signed.apk - tag: nightly - overwrite: true + - name: Sign APK - WithoutInternet + uses: ilharp/sign-android-release@v1.0.4 + # ID used to access action output + id: sign_app_withoutInternet + with: + releaseDir: app/build/outputs/apk/withoutInternet/release + signingKey: ${{ secrets.SIGNINGKEY_BASE64 }} + keyAlias: ${{ secrets.KEY_ALIAS }} + keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} + keyPassword: ${{ secrets.KEY_PASSWORD }} + buildToolsVersion: 33.0.0 + - name: Release to GitHub - WithoutInternet + uses: svenstaro/upload-release-action@2.9.0 + with: + release_name: "Nightly" + repo_token: ${{ secrets.GIT_BOT_TOKEN }} + file: ${{steps.sign_app_withoutInternet.outputs.signedFile}} + asset_name: EasyLauncher-Nightly-Signed.apk + tag: nightly + body: "This is a nightly build." + prerelease: true + overwrite: true