From e4c5d831863c8ab4a756ebbebe3986530183eae5 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Fri, 7 Jun 2024 13:10:51 +1200 Subject: [PATCH 01/22] fix: checkout code first --- .github/workflows/update-version.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 1f8d501f..3e0eb3b8 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -2,16 +2,20 @@ name: "Update version in package.json" on: - workflow_dispatch: - inputs: - version: - description: 'Version to update to (e.g. 1.20.0)' - required: true + push: + # workflow_dispatch: + # inputs: + # version: + # description: 'Version to update to (e.g. 1.20.0)' + # required: true jobs: update: runs-on: ubuntu-latest steps: + - name: Checkout code + uses: actions/checkout@v3 + - name: Check team membership id: check_team run: | @@ -21,9 +25,6 @@ jobs: exit 1 fi - - name: Checkout code - uses: actions/checkout@v3 - - name: Set up Python uses: actions/setup-python@v4 with: From 81372edf7201f66f214705e8830819903ba96fa7 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Fri, 7 Jun 2024 13:13:05 +1200 Subject: [PATCH 02/22] test: workflow changes --- .github/workflows/update-version.yml | 62 +++++++++++++++------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 3e0eb3b8..26ebcc31 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -25,34 +25,40 @@ jobs: exit 1 fi - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.x' + - name: Echo team membership + run: echo "${{ steps.check_team.outputs.is_member }}" - - name: Install jq - run: sudo apt-get install -y jq + - name: Echo SdkVersionHelper + run: echo "$(cat ./src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs)" - - name: Replace version string - id: replace_version - run: | - FILE=./src/Packages/Passport/package.json - VERSION=${{ github.event.inputs.version }} - jq --arg version "$VERSION" '.version = $version' $FILE > tmp.$$.json && mv tmp.$$.json $FILE + # - name: Set up Python + # uses: actions/setup-python@v4 + # with: + # python-version: '3.x' - - name: Replace engine sdk version string - id: replace_engine_sdk_version - run: | - FILE=./src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs - VERSION=${{ github.event.inputs.version }} - sed -i -E "s/[0-9]+\.[0-9]+\.[0-9]+/$VERSION/g" $FILE - - - uses: gr2m/create-or-update-pull-request-action@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - title: "release: update version" - body: "Update version in package.json" - branch: "release/update-version" - commit-message: "release: update version" - labels: release \ No newline at end of file + # - name: Install jq + # run: sudo apt-get install -y jq + + # - name: Replace version string + # id: replace_version + # run: | + # FILE=./src/Packages/Passport/package.json + # VERSION=${{ github.event.inputs.version }} + # jq --arg version "$VERSION" '.version = $version' $FILE > tmp.$$.json && mv tmp.$$.json $FILE + + # - name: Replace engine sdk version string + # id: replace_engine_sdk_version + # run: | + # FILE=./src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs + # VERSION=${{ github.event.inputs.version }} + # sed -i -E "s/[0-9]+\.[0-9]+\.[0-9]+/$VERSION/g" $FILE + + # - uses: gr2m/create-or-update-pull-request-action@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # title: "release: update version" + # body: "Update version in package.json" + # branch: "release/update-version" + # commit-message: "release: update version" + # labels: release \ No newline at end of file From 709dd1a88418212aa6074d54cab29ab4dc5c3665 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Fri, 7 Jun 2024 13:15:18 +1200 Subject: [PATCH 03/22] test: check membership script --- .github/scripts/check_team_membership.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/scripts/check_team_membership.sh b/.github/scripts/check_team_membership.sh index 51c958d4..9ca7b574 100755 --- a/.github/scripts/check_team_membership.sh +++ b/.github/scripts/check_team_membership.sh @@ -5,6 +5,8 @@ TOKEN=$2 response=$(curl -s -H "Authorization: token $TOKEN" "https://api.github.com/orgs/immutable/teams/sdk/memberships/$USER") +echo "$response" + if echo "$response" | grep -q '"state": "active"'; then echo "true" else From 9b9cda252decca5157d4b33ff6df214888fcd62b Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Fri, 7 Jun 2024 13:21:04 +1200 Subject: [PATCH 04/22] test: enable more workflow script debugging --- .github/scripts/check_team_membership.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/scripts/check_team_membership.sh b/.github/scripts/check_team_membership.sh index 9ca7b574..ecd12d41 100755 --- a/.github/scripts/check_team_membership.sh +++ b/.github/scripts/check_team_membership.sh @@ -1,9 +1,11 @@ #!/bin/bash +set -x + USER=$1 TOKEN=$2 -response=$(curl -s -H "Authorization: token $TOKEN" "https://api.github.com/orgs/immutable/teams/sdk/memberships/$USER") +response=$(curl -L -H "Authorization: Bearer $TOKEN" -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" "https://api.github.com/orgs/immutable/teams/sdk/memberships/$USER") echo "$response" From 1e00ef5234efc540ef38b540fe6e1701b1c8ce1e Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Fri, 7 Jun 2024 13:46:10 +1200 Subject: [PATCH 05/22] test: username case --- .github/scripts/check_team_membership.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/check_team_membership.sh b/.github/scripts/check_team_membership.sh index ecd12d41..e69083b8 100755 --- a/.github/scripts/check_team_membership.sh +++ b/.github/scripts/check_team_membership.sh @@ -5,7 +5,7 @@ set -x USER=$1 TOKEN=$2 -response=$(curl -L -H "Authorization: Bearer $TOKEN" -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" "https://api.github.com/orgs/immutable/teams/sdk/memberships/$USER") +response=$(curl -L -H "Authorization: Bearer $TOKEN" -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" "https://api.github.com/orgs/immutable/teams/sdk/memberships/codeschwert") echo "$response" From 05d33dc0f84389b665f8cdac8163125222b5e6d0 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Fri, 7 Jun 2024 14:14:23 +1200 Subject: [PATCH 06/22] test: get additional team data --- .github/scripts/check_team_membership.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/scripts/check_team_membership.sh b/.github/scripts/check_team_membership.sh index e69083b8..821a4701 100755 --- a/.github/scripts/check_team_membership.sh +++ b/.github/scripts/check_team_membership.sh @@ -5,6 +5,18 @@ set -x USER=$1 TOKEN=$2 +echo "$(curl -L \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer $TOKEN" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + https://api.github.com/orgs/immutable/teams)" + +echo "$(curl -L \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer $TOKEN" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + https://api.github.com/orgs/immutable/teams/sdk/members)" + response=$(curl -L -H "Authorization: Bearer $TOKEN" -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" "https://api.github.com/orgs/immutable/teams/sdk/memberships/codeschwert") echo "$response" From fc900d0345296817c9ab39710d2ee9bdaeba5c24 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 16:49:15 +1200 Subject: [PATCH 07/22] test: workflow --- .github/workflows/update-version.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 26ebcc31..bba5209c 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -31,6 +31,9 @@ jobs: - name: Echo SdkVersionHelper run: echo "$(cat ./src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs)" + - name: Echo Github Event + run: echo "${{ toJson(github.event) }}" + # - name: Set up Python # uses: actions/setup-python@v4 # with: From fe52ff784149b6698768b6afdfd5ce56cf7b269f Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 17:12:25 +1200 Subject: [PATCH 08/22] fix: use new github token --- .github/workflows/update-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index bba5209c..66de3fe4 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -19,7 +19,7 @@ jobs: - name: Check team membership id: check_team run: | - IS_MEMBER=$(./.github/scripts/check_team_membership.sh "${{ github.actor }}" "${{ secrets.GITHUB_TOKEN }}") + IS_MEMBER=$(./.github/scripts/check_team_membership.sh "${{ github.actor }}" "${{ secrets.UNITY_IMMUTABLE_SDK_GITHUB_TOKEN }}") if [[ "$IS_MEMBER" != "true" ]]; then echo "Not a member of the SDK team, skipping update" exit 1 From c4ba8d061370cb2eec3151c09b6bd856bdb53ccc Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 17:23:49 +1200 Subject: [PATCH 09/22] fix: switch to using github cli --- .github/scripts/check_team_membership.sh | 15 ++++++++------- .github/workflows/update-version.yml | 2 ++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/scripts/check_team_membership.sh b/.github/scripts/check_team_membership.sh index 821a4701..5f000fab 100755 --- a/.github/scripts/check_team_membership.sh +++ b/.github/scripts/check_team_membership.sh @@ -5,19 +5,20 @@ set -x USER=$1 TOKEN=$2 -echo "$(curl -L \ +echo "$(gh api \ -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer $TOKEN" \ -H "X-GitHub-Api-Version: 2022-11-28" \ - https://api.github.com/orgs/immutable/teams)" + /orgs/immutable/teams)" -echo "$(curl -L \ +echo "$(gh api \ -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer $TOKEN" \ -H "X-GitHub-Api-Version: 2022-11-28" \ - https://api.github.com/orgs/immutable/teams/sdk/members)" + /orgs/immutable/teams/sdk/members)" -response=$(curl -L -H "Authorization: Bearer $TOKEN" -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" "https://api.github.com/orgs/immutable/teams/sdk/memberships/codeschwert") +response=$(gh api \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + /orgs/immutable/teams/sdk/memberships/codeschwert) echo "$response" diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 66de3fe4..708791b5 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -12,6 +12,8 @@ on: jobs: update: runs-on: ubuntu-latest + env: + GH_TOKEN: ${{ secrets.UNITY_IMMUTABLE_SDK_GITHUB_TOKEN }} steps: - name: Checkout code uses: actions/checkout@v3 From 6d539f76bbdbefa4ef8f0a4109cebfef291bfed2 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 17:28:59 +1200 Subject: [PATCH 10/22] test: use actor token for cli requests --- .github/workflows/update-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 708791b5..ba0d9f5e 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -13,7 +13,7 @@ jobs: update: runs-on: ubuntu-latest env: - GH_TOKEN: ${{ secrets.UNITY_IMMUTABLE_SDK_GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Checkout code uses: actions/checkout@v3 From da14aa7eb3dd7ed49ef97406f8420068c4eac232 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 17:42:45 +1200 Subject: [PATCH 11/22] test: github token with updated permissions --- .github/workflows/update-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index ba0d9f5e..708791b5 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -13,7 +13,7 @@ jobs: update: runs-on: ubuntu-latest env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.UNITY_IMMUTABLE_SDK_GITHUB_TOKEN }} steps: - name: Checkout code uses: actions/checkout@v3 From aede3ca0748006b2c1db48da4953ce7ee03614d9 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 17:47:07 +1200 Subject: [PATCH 12/22] test: tune grep --- .github/scripts/check_team_membership.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/scripts/check_team_membership.sh b/.github/scripts/check_team_membership.sh index 5f000fab..0df14094 100755 --- a/.github/scripts/check_team_membership.sh +++ b/.github/scripts/check_team_membership.sh @@ -5,11 +5,6 @@ set -x USER=$1 TOKEN=$2 -echo "$(gh api \ - -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - /orgs/immutable/teams)" - echo "$(gh api \ -H "Accept: application/vnd.github+json" \ -H "X-GitHub-Api-Version: 2022-11-28" \ @@ -22,7 +17,7 @@ response=$(gh api \ echo "$response" -if echo "$response" | grep -q '"state": "active"'; then +if echo "$response" | grep -q '"state":"active"'; then echo "true" else echo "false" From 6ff6ed8aa4f3ceab0741b56d06acc1fda108e815 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 17:49:21 +1200 Subject: [PATCH 13/22] fix: return boolean string from check script --- .github/scripts/check_team_membership.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/scripts/check_team_membership.sh b/.github/scripts/check_team_membership.sh index 0df14094..a4fb4fdf 100755 --- a/.github/scripts/check_team_membership.sh +++ b/.github/scripts/check_team_membership.sh @@ -19,6 +19,8 @@ echo "$response" if echo "$response" | grep -q '"state":"active"'; then echo "true" + return "true" else echo "false" + return "false" fi From 9872652e3c46abaf2d8065630b0d1f6e98026095 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 17:53:36 +1200 Subject: [PATCH 14/22] test: debug script output --- .github/scripts/check_team_membership.sh | 2 -- .github/workflows/update-version.yml | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/scripts/check_team_membership.sh b/.github/scripts/check_team_membership.sh index a4fb4fdf..0df14094 100755 --- a/.github/scripts/check_team_membership.sh +++ b/.github/scripts/check_team_membership.sh @@ -19,8 +19,6 @@ echo "$response" if echo "$response" | grep -q '"state":"active"'; then echo "true" - return "true" else echo "false" - return "false" fi diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 708791b5..5eb7a3e5 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -22,9 +22,10 @@ jobs: id: check_team run: | IS_MEMBER=$(./.github/scripts/check_team_membership.sh "${{ github.actor }}" "${{ secrets.UNITY_IMMUTABLE_SDK_GITHUB_TOKEN }}") + echo "$IS_MEMBER" if [[ "$IS_MEMBER" != "true" ]]; then echo "Not a member of the SDK team, skipping update" - exit 1 + # exit 1 fi - name: Echo team membership From d017fe7fd88654b6f9b653726f2a95b3dc9bd50a Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 18:54:17 +1200 Subject: [PATCH 15/22] test: set the member status inside the check member script --- .github/scripts/check_team_membership.sh | 8 ++++++-- .github/workflows/update-version.yml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/scripts/check_team_membership.sh b/.github/scripts/check_team_membership.sh index 0df14094..a4c133d3 100755 --- a/.github/scripts/check_team_membership.sh +++ b/.github/scripts/check_team_membership.sh @@ -18,7 +18,11 @@ response=$(gh api \ echo "$response" if echo "$response" | grep -q '"state":"active"'; then - echo "true" + IS_MEMBER=true else - echo "false" + IS_MEMBER=false fi +echo "$IS_MEMBER" + +# Set the environment variable for the GitHub workflow +echo "IS_MEMBER=$IS_MEMBER" >> $GITHUB_ENV diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 5eb7a3e5..72d880cd 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -21,7 +21,7 @@ jobs: - name: Check team membership id: check_team run: | - IS_MEMBER=$(./.github/scripts/check_team_membership.sh "${{ github.actor }}" "${{ secrets.UNITY_IMMUTABLE_SDK_GITHUB_TOKEN }}") + ./.github/scripts/check_team_membership.sh "${{ github.actor }}" "${{ secrets.UNITY_IMMUTABLE_SDK_GITHUB_TOKEN }}" echo "$IS_MEMBER" if [[ "$IS_MEMBER" != "true" ]]; then echo "Not a member of the SDK team, skipping update" From 9ab1752ed9b2cd75aad60d3501ad911f7ec63c44 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 18:57:54 +1200 Subject: [PATCH 16/22] fix: source environment variables --- .github/workflows/update-version.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 72d880cd..cfd443f6 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -22,7 +22,8 @@ jobs: id: check_team run: | ./.github/scripts/check_team_membership.sh "${{ github.actor }}" "${{ secrets.UNITY_IMMUTABLE_SDK_GITHUB_TOKEN }}" - echo "$IS_MEMBER" + source $GITHUB_ENV + echo "${{ github.actor }} is a member of the SDK team: $IS_MEMBER" if [[ "$IS_MEMBER" != "true" ]]; then echo "Not a member of the SDK team, skipping update" # exit 1 From c45512ce48a4d32f56f9e1c4b3d5cded31bf38c4 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 18:58:25 +1200 Subject: [PATCH 17/22] fix: remove logging workflow event object --- .github/workflows/update-version.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index cfd443f6..d6fbaf5b 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -35,9 +35,6 @@ jobs: - name: Echo SdkVersionHelper run: echo "$(cat ./src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs)" - - name: Echo Github Event - run: echo "${{ toJson(github.event) }}" - # - name: Set up Python # uses: actions/setup-python@v4 # with: From 8c9d2b3377b1b3f006193f396d39dd52e6094cfd Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 23:01:53 +1200 Subject: [PATCH 18/22] test: workflow --- .github/workflows/update-version.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index d6fbaf5b..867e52a3 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -26,22 +26,19 @@ jobs: echo "${{ github.actor }} is a member of the SDK team: $IS_MEMBER" if [[ "$IS_MEMBER" != "true" ]]; then echo "Not a member of the SDK team, skipping update" - # exit 1 + exit 1 fi - - name: Echo team membership - run: echo "${{ steps.check_team.outputs.is_member }}" - - name: Echo SdkVersionHelper run: echo "$(cat ./src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs)" - # - name: Set up Python - # uses: actions/setup-python@v4 - # with: - # python-version: '3.x' + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.x' - # - name: Install jq - # run: sudo apt-get install -y jq + - name: Install jq + run: sudo apt-get install -y jq # - name: Replace version string # id: replace_version From 30c054de83d8338d29b2fe51c496abd592f25131 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 23:05:38 +1200 Subject: [PATCH 19/22] chore: uncomment workflow code --- .github/workflows/update-version.yml | 56 +++++++++++++--------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 867e52a3..374f86c6 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -2,12 +2,11 @@ name: "Update version in package.json" on: - push: - # workflow_dispatch: - # inputs: - # version: - # description: 'Version to update to (e.g. 1.20.0)' - # required: true + workflow_dispatch: + inputs: + version: + description: 'Version to update to (e.g. 1.20.0)' + required: true jobs: update: @@ -29,9 +28,6 @@ jobs: exit 1 fi - - name: Echo SdkVersionHelper - run: echo "$(cat ./src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs)" - - name: Set up Python uses: actions/setup-python@v4 with: @@ -40,26 +36,26 @@ jobs: - name: Install jq run: sudo apt-get install -y jq - # - name: Replace version string - # id: replace_version - # run: | - # FILE=./src/Packages/Passport/package.json - # VERSION=${{ github.event.inputs.version }} - # jq --arg version "$VERSION" '.version = $version' $FILE > tmp.$$.json && mv tmp.$$.json $FILE + - name: Replace version string + id: replace_version + run: | + FILE=./src/Packages/Passport/package.json + VERSION=${{ github.event.inputs.version }} + jq --arg version "$VERSION" '.version = $version' $FILE > tmp.$$.json && mv tmp.$$.json $FILE - # - name: Replace engine sdk version string - # id: replace_engine_sdk_version - # run: | - # FILE=./src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs - # VERSION=${{ github.event.inputs.version }} - # sed -i -E "s/[0-9]+\.[0-9]+\.[0-9]+/$VERSION/g" $FILE + - name: Replace engine sdk version string + id: replace_engine_sdk_version + run: | + FILE=./src/Packages/Passport/Runtime/Scripts/Private/Helpers/SdkVersionInfoHelpers.cs + VERSION=${{ github.event.inputs.version }} + sed -i -E "s/[0-9]+\.[0-9]+\.[0-9]+/$VERSION/g" $FILE - # - uses: gr2m/create-or-update-pull-request-action@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # title: "release: update version" - # body: "Update version in package.json" - # branch: "release/update-version" - # commit-message: "release: update version" - # labels: release \ No newline at end of file + - uses: gr2m/create-or-update-pull-request-action@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + title: "release: update version" + body: "Update version in package.json" + branch: "release/update-version" + commit-message: "release: update version" + labels: release From 4380865b991df0fa57b610528ce22c43eae03e8d Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Tue, 18 Jun 2024 23:13:33 +1200 Subject: [PATCH 20/22] fix: linting --- .github/scripts/check_team_membership.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/scripts/check_team_membership.sh b/.github/scripts/check_team_membership.sh index a4c133d3..42678e36 100755 --- a/.github/scripts/check_team_membership.sh +++ b/.github/scripts/check_team_membership.sh @@ -3,17 +3,11 @@ set -x USER=$1 -TOKEN=$2 - -echo "$(gh api \ - -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - /orgs/immutable/teams/sdk/members)" response=$(gh api \ -H "Accept: application/vnd.github+json" \ -H "X-GitHub-Api-Version: 2022-11-28" \ - /orgs/immutable/teams/sdk/memberships/codeschwert) + /orgs/immutable/teams/sdk/memberships/$USER) echo "$response" @@ -25,4 +19,4 @@ fi echo "$IS_MEMBER" # Set the environment variable for the GitHub workflow -echo "IS_MEMBER=$IS_MEMBER" >> $GITHUB_ENV +echo "IS_MEMBER=$IS_MEMBER" >> "$GITHUB_ENV" From dce0cdcfa1e54da75864eb8184f58b6e33a9442e Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Wed, 19 Jun 2024 14:53:44 +1200 Subject: [PATCH 21/22] fix: lint error --- .github/scripts/check_team_membership.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/check_team_membership.sh b/.github/scripts/check_team_membership.sh index 42678e36..6af1f506 100755 --- a/.github/scripts/check_team_membership.sh +++ b/.github/scripts/check_team_membership.sh @@ -7,7 +7,7 @@ USER=$1 response=$(gh api \ -H "Accept: application/vnd.github+json" \ -H "X-GitHub-Api-Version: 2022-11-28" \ - /orgs/immutable/teams/sdk/memberships/$USER) + "/orgs/immutable/teams/sdk/memberships/${USER}") echo "$response" From 0989e4063feab552c460dda0c797879523a03939 Mon Sep 17 00:00:00 2001 From: Nik Ho Date: Wed, 19 Jun 2024 16:02:41 +1200 Subject: [PATCH 22/22] fix: more linting --- .github/workflows/update-version.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 374f86c6..d841e87d 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -21,7 +21,8 @@ jobs: id: check_team run: | ./.github/scripts/check_team_membership.sh "${{ github.actor }}" "${{ secrets.UNITY_IMMUTABLE_SDK_GITHUB_TOKEN }}" - source $GITHUB_ENV + # shellcheck disable=SC1090 + source "$GITHUB_ENV" echo "${{ github.actor }} is a member of the SDK team: $IS_MEMBER" if [[ "$IS_MEMBER" != "true" ]]; then echo "Not a member of the SDK team, skipping update"