From 26fb2ea238dd68770f4602cdf92f7e84e6830217 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 2 Jun 2023 16:40:41 +0200 Subject: [PATCH] Iterate on the script --- .github/workflows/recordScreenshots.yml | 6 ----- .../workflows/scripts/recordScreenshots.sh | 22 ++++++++++++++----- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/recordScreenshots.yml b/.github/workflows/recordScreenshots.yml index 5e51571ae4..52da484b9a 100644 --- a/.github/workflows/recordScreenshots.yml +++ b/.github/workflows/recordScreenshots.yml @@ -2,11 +2,6 @@ name: Record screenshots on: workflow_dispatch: - inputs: - param_branch: - description: 'Branch to record the screenshots on' - required: true - type: string # Enrich gradle.properties for CI/CD env: @@ -32,4 +27,3 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }} - BRANCH: ${{ inputs.param_branch }} diff --git a/.github/workflows/scripts/recordScreenshots.sh b/.github/workflows/scripts/recordScreenshots.sh index fd2331d47a..d8cdbd0c6f 100755 --- a/.github/workflows/scripts/recordScreenshots.sh +++ b/.github/workflows/scripts/recordScreenshots.sh @@ -26,18 +26,30 @@ if [[ -z ${GITHUB_REPOSITORY} ]]; then exit 1 fi -if [[ -z ${BRANCH} ]]; then - echo "Missing BRANCH variable" +if [[ -z ${GITHUB_REF_NAME} ]]; then + echo "Missing GITHUB_REF_NAME variable" exit 1 fi -./gradlew recordPaparazziDebug --stacktrace -PpreDexEnable=false --max-workers 4 --warn - git config user.name "ElementBot" git config user.email "benoitm+elementbot@element.io" + +echo "Git status" +git status + +echo "Fetching..." git fetch --all -git checkout --track "origin/$BRANCH" + +echo "Checkout origin/$GITHUB_REF_NAME" +git checkout "origin/$GITHUB_REF_NAME" + +echo "Record screenshots" +./gradlew recordPaparazziDebug --stacktrace -PpreDexEnable=false --max-workers 4 --warn + +echo "Committing changes" git add -A git commit -m "Update screenshots" + +echo "Pushing changes" git push "https://$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY.git" echo "Done!"