From cd627aa484c7f887aa80abf339c982d44c6eacf8 Mon Sep 17 00:00:00 2001 From: MarkG Date: Tue, 5 Nov 2024 15:19:21 +0700 Subject: [PATCH] test --- .../create_release_pull_request.yml | 15 +-- .../workflows/create_release_pull_request.yml | 93 ------------- .../test_create_release_pull_request.yml | 127 ++++++++++++++++++ 3 files changed, 133 insertions(+), 102 deletions(-) delete mode 100644 .github/workflows/create_release_pull_request.yml create mode 100644 .github/workflows/test_create_release_pull_request.yml diff --git a/.github/project_workflows/create_release_pull_request.yml b/.github/project_workflows/create_release_pull_request.yml index d35268c5..c9dcd65f 100644 --- a/.github/project_workflows/create_release_pull_request.yml +++ b/.github/project_workflows/create_release_pull_request.yml @@ -7,9 +7,6 @@ on: description: "Next version (eg. 1.0.0)" required: true type: string - push: - branches: - - feature/557-automate-release-pull-request-creation-process concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -67,15 +64,15 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - branch: chore/bump-version-to-1.1.0 + branch: chore/bump-version-to-${{ github.event.inputs.nextVersion }} - name: Checkout code uses: actions/checkout@v4 with: - ref: chore/bump-version-to-1.1.0 + ref: chore/bump-version-to-${{ github.event.inputs.nextVersion }} - name: Bump version - run: sed -i "" "s/MARKETING_VERSION = .*/MARKETING_VERSION = 1.1.0;/g" Smashburger.xcodeproj/project.pbxproj + run: sed -i "" "s/MARKETING_VERSION = .*/MARKETING_VERSION = ${{ github.event.inputs.nextVersion }};/g" Smashburger.xcodeproj/project.pbxproj - name: Set up Git run: | @@ -85,12 +82,12 @@ jobs: - name: Commit changes run: | git add . - git commit -m "[Chore] Bump version to 1.1.0" + git commit -m "[Chore] Bump version to ${{ github.event.inputs.nextVersion }}" git push origin HEAD - name: Create pull request run: | - echo -e "## What happened 👀\n\nBump version to 1.1.0" > body - export body=$(cat body) ; gh pr create --draft -B develop -H chore/bump-version-to-1.1.0 -t '[Chore] Bump version to 1.1.0' -b "$body" + echo -e "## What happened 👀\n\nBump version to ${{ github.event.inputs.nextVersion }}" > body + export body=$(cat body) ; gh pr create --draft -B develop -H chore/bump-version-to-${{ github.event.inputs.nextVersion }} -t '[Chore] Bump version to ${{ github.event.inputs.nextVersion }}' -b "$body" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/create_release_pull_request.yml b/.github/workflows/create_release_pull_request.yml deleted file mode 100644 index c9dcd65f..00000000 --- a/.github/workflows/create_release_pull_request.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: Create Release Pull Request - -on: - workflow_dispatch: - inputs: - nextVersion: - description: "Next version (eg. 1.0.0)" - required: true - type: string - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - create_release_pull_request: - name: Create Release Pull Request - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Find HEAD commit - id: head - run: echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - - - name: Build changelog on "main" - id: changelog - uses: mikepenz/release-changelog-builder-action@v4 - with: - configuration: ".github/workflows/configs/changelog-config.json" - # Listing PRs from the last tag to the HEAD commit - toTag: ${{ steps.head.outputs.sha }} - token: ${{ secrets.GITHUB_TOKEN }} - - - name: Prepare variables - run: | - echo "RELEASE_VERSION=$(grep -oP 'MARKETING_VERSION\s*=\s*[^;]+' Smashburger.xcodeproj/project.pbxproj | head -n 1 | sed 's/^[^=]*=\s*//' | tr -d ' ')" >> $GITHUB_ENV - echo "${{ steps.changelog.outputs.changelog }}" | sed 's/"/\\"/g' > escaped-changelog.txt - - - name: Create Release branch - uses: peterjgrainger/action-create-branch@v2.2.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - branch: release/${{ env.RELEASE_VERSION }} - - - name: Create pull request - run: gh pr create --draft -B main -H release/${{ env.RELEASE_VERSION }} -t 'Release - ${{ env.RELEASE_VERSION }}' -b "$(cat escaped-changelog.txt)" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - create_bump_version_pull_request: - name: Create Bump Version Pull Request - runs-on: macos-latest - timeout-minutes: 30 - permissions: - contents: write - pull-requests: write - steps: - - name: Create Bump Version branch - uses: peterjgrainger/action-create-branch@v2.2.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - branch: chore/bump-version-to-${{ github.event.inputs.nextVersion }} - - - name: Checkout code - uses: actions/checkout@v4 - with: - ref: chore/bump-version-to-${{ github.event.inputs.nextVersion }} - - - name: Bump version - run: sed -i "" "s/MARKETING_VERSION = .*/MARKETING_VERSION = ${{ github.event.inputs.nextVersion }};/g" Smashburger.xcodeproj/project.pbxproj - - - name: Set up Git - run: | - git config --global user.name 'Github Actions' - git config --global user.email 'github-actions@users.noreply.github.com' - - - name: Commit changes - run: | - git add . - git commit -m "[Chore] Bump version to ${{ github.event.inputs.nextVersion }}" - git push origin HEAD - - - name: Create pull request - run: | - echo -e "## What happened 👀\n\nBump version to ${{ github.event.inputs.nextVersion }}" > body - export body=$(cat body) ; gh pr create --draft -B develop -H chore/bump-version-to-${{ github.event.inputs.nextVersion }} -t '[Chore] Bump version to ${{ github.event.inputs.nextVersion }}' -b "$body" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test_create_release_pull_request.yml b/.github/workflows/test_create_release_pull_request.yml new file mode 100644 index 00000000..9c23a858 --- /dev/null +++ b/.github/workflows/test_create_release_pull_request.yml @@ -0,0 +1,127 @@ +name: Create Release Pull Request + +on: + workflow_dispatch: + inputs: + nextVersion: + description: "Next version (eg. 1.0.0)x" + required: true + type: string + push: + branches: + - feature/557-automate-release-pull-request-creation-process + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + create_release_pull_request: + name: Create Release Pull Request + runs-on: macOS-latest + timeout-minutes: 30 + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Install SSH key + uses: webfactory/ssh-agent@v0.7.0 + with: + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + + - name: Install Firebase-Tools + run: | + yarn global add firebase-tools + echo "$(yarn global bin)" >> $GITHUB_PATH + + - name: Read Google Service Account + id: firebase_service_account + uses: timheuer/base64-to-file@v1.2 + with: + fileName: 'firebase_service_account.json' + encodedString: ${{ secrets.FIREBASE_GOOGLE_APPLICATION_CREDENTIALS_BASE64 }} + + - name: Bundle install + run: bundle install + + - name: Cache Pods + uses: actions/cache@v3 + id: cocoapodCache + with: + path: Pods + key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} + restore-keys: | + ${{ runner.os }}-pods- + + - name: Start Install Script for Template App + run: swift run --package-path Scripts/Swift/iOSTemplateMaker iOSTemplateMaker make --bundle-id-production co.nimblehq.ios.templates --bundle-id-staging co.nimblehq.ios.templates.staging --project-name TemplateApp --interface UIKit + - name: Find HEAD commit + id: head + run: echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT + + - name: Build changelog on "main" + id: changelog + uses: mikepenz/release-changelog-builder-action@v4 + with: + configuration: ".github/workflows/configs/changelog-config.json" + # Listing PRs from the last tag to the HEAD commit + toTag: ${{ steps.head.outputs.sha }} + token: ${{ secrets.GITHUB_TOKEN }} + + - name: Prepare variables + run: | + echo "RELEASE_VERSION=$(grep -oP 'MARKETING_VERSION\s*=\s*[^;]+' {PROJECT_NAME}.xcodeproj/project.pbxproj | head -n 1 | sed 's/^[^=]*=\s*//' | tr -d ' ')" >> $GITHUB_ENV + echo "${{ steps.changelog.outputs.changelog }}" | sed 's/"/\\"/g' > escaped-changelog.txt + + - name: Create Release branch + uses: peterjgrainger/action-create-branch@v2.2.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + branch: release/${{ env.RELEASE_VERSION }} + + - name: Create pull request + run: gh pr create --draft -B main -H release/${{ env.RELEASE_VERSION }} -t 'Release - ${{ env.RELEASE_VERSION }}' -b "$(cat escaped-changelog.txt)" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + # create_bump_version_pull_request: + # name: Create Bump Version Pull Request + # runs-on: macos-latest + # timeout-minutes: 30 + # permissions: + # contents: write + # pull-requests: write + # steps: + # - name: Create Bump Version branch + # uses: peterjgrainger/action-create-branch@v2.2.0 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # branch: chore/bump-version-to-1.1.0 + + # - name: Checkout code + # uses: actions/checkout@v4 + # with: + # ref: chore/bump-version-to-1.1.0 + + # - name: Bump version + # run: sed -i "" "s/MARKETING_VERSION = .*/MARKETING_VERSION = 1.1.0;/g" {PROJECT_NAME}.xcodeproj/project.pbxproj + + # - name: Set up Git + # run: | + # git config --global user.name 'Github Actions' + # git config --global user.email 'github-actions@users.noreply.github.com' + + # - name: Commit changes + # run: | + # git add . + # git commit -m "[Chore] Bump version to 1.1.0" + # git push origin HEAD + + # - name: Create pull request + # run: | + # echo -e "## What happened 👀\n\nBump version to 1.1.0" > body + # export body=$(cat body) ; gh pr create --draft -B develop -H chore/bump-version-to-1.1.0 -t '[Chore] Bump version to 1.1.0' -b "$body" + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}