Skip to content

Commit 3775cea

Browse files
committed
use github token for fork testing
1 parent e242021 commit 3775cea

File tree

2 files changed

+32
-31
lines changed

2 files changed

+32
-31
lines changed

.github/workflows/post-release-version-bump.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ permissions:
1414
id-token: write
1515
contents: write
1616
pull-requests: write
17+
actions: write
1718

1819
jobs:
1920
check-version:
@@ -58,25 +59,25 @@ jobs:
5859
runs-on: ubuntu-latest
5960
needs: check-version
6061
steps:
61-
- name: Configure AWS credentials for BOT secrets
62-
uses: aws-actions/configure-aws-credentials@v4
63-
with:
64-
role-to-assume: ${{ secrets.AWS_ROLE_ARN_SECRETS_MANAGER }}
65-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
66-
67-
- name: Get Bot secrets
68-
uses: aws-actions/aws-secretsmanager-get-secrets@v1
69-
id: bot_secrets
70-
with:
71-
secret-ids: |
72-
BOT_TOKEN ,${{ secrets.BOT_TOKEN_SECRET_ARN }}
73-
parse-json-secrets: true
62+
# - name: Configure AWS credentials for BOT secrets
63+
# uses: aws-actions/configure-aws-credentials@v4
64+
# with:
65+
# role-to-assume: ${{ secrets.AWS_ROLE_ARN_SECRETS_MANAGER }}
66+
# aws-region: ${{ env.AWS_DEFAULT_REGION }}
67+
#
68+
# - name: Get Bot secrets
69+
# uses: aws-actions/aws-secretsmanager-get-secrets@v1
70+
# id: bot_secrets
71+
# with:
72+
# secret-ids: |
73+
# BOT_TOKEN ,${{ secrets.BOT_TOKEN_SECRET_ARN }}
74+
# parse-json-secrets: true
7475

7576
- name: Setup Git
7677
uses: actions/checkout@v2
7778
with:
7879
fetch-depth: 0
79-
token: ${{ env.BOT_TOKEN_GITHUB_RW_PATOKEN }}
80+
token: ${{ secrets.GITHUB_TOKEN }}
8081

8182
- name: Configure Git
8283
run: |
@@ -99,15 +100,15 @@ jobs:
99100
DEV_VERSION="${{ github.event.inputs.version }}.dev0"
100101
sed -i'' -e "s/val adotVersion = \".*\"/val adotVersion = \"${DEV_VERSION}\"/" version.gradle.kts
101102
VERSION="${{ github.event.inputs.version }}"
102-
sed -i'' -e 's/adot-autoinstrumentation-java:v2\.[0-9]+\.[0-9]+/adot-autoinstrumentation-java:v'$VERSION'/g' .github/workflows/daily-scan.yml
103+
sed -i'' -e 's/adot-autoinstrumentation-java:v2.*"/adot-autoinstrumentation-java:v'$VERSION'"/' .github/workflows/daily-scan.yml
103104
git add version.gradle.kts
104105
git add .github/workflows/daily-scan.yml
105106
git commit -m "Prepare main for next development cycle: Update version to $DEV_VERSION"
106107
git push --set-upstream origin "prepare-main-for-next-dev-cycle-${VERSION}"
107108
108109
- name: Create Pull Request to main
109110
env:
110-
GITHUB_TOKEN: ${{ env.BOT_TOKEN_GITHUB_RW_PATOKEN }}
111+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111112
run: |
112113
DEV_VERSION="${{ github.event.inputs.version }}.dev0"
113114
gh pr create --title "Post release $VERSION: Update version to $DEV_VERSION" \

.github/workflows/pre-release-prepare.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,25 @@ jobs:
2424
update-version-and-create-pr:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- name: Configure AWS credentials for BOT secrets
28-
uses: aws-actions/configure-aws-credentials@v4
29-
with:
30-
role-to-assume: ${{ secrets.AWS_ROLE_ARN_SECRETS_MANAGER }}
31-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
32-
33-
- name: Get Bot secrets
34-
uses: aws-actions/aws-secretsmanager-get-secrets@v1
35-
id: bot_secrets
36-
with:
37-
secret-ids: |
38-
BOT_TOKEN ,${{ secrets.BOT_TOKEN_SECRET_ARN }}
39-
parse-json-secrets: true
27+
# - name: Configure AWS credentials for BOT secrets
28+
# uses: aws-actions/configure-aws-credentials@v4
29+
# with:
30+
# role-to-assume: ${{ secrets.AWS_ROLE_ARN_SECRETS_MANAGER }}
31+
# aws-region: ${{ env.AWS_DEFAULT_REGION }}
32+
#
33+
# - name: Get Bot secrets
34+
# uses: aws-actions/aws-secretsmanager-get-secrets@v1
35+
# id: bot_secrets
36+
# with:
37+
# secret-ids: |
38+
# BOT_TOKEN ,${{ secrets.BOT_TOKEN_SECRET_ARN }}
39+
# parse-json-secrets: true
4040

4141
- name: Checkout main branch
4242
uses: actions/checkout@v3
4343
with:
4444
ref: 'main'
45-
token: ${{ env.BOT_TOKEN_GITHUB_RW_PATOKEN }}
45+
token: ${{ secrets.GITHUB_TOKEN }}
4646

4747
- name: Setup Git
4848
run: |
@@ -96,7 +96,7 @@ jobs:
9696
9797
- name: Create pull request against the release branch
9898
env:
99-
GITHUB_TOKEN: ${{ env.BOT_TOKEN_GITHUB_RW_PATOKEN }}
99+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100100
run: |
101101
gh pr create --title "Pre-release: Update version to ${VERSION}" \
102102
--body "This PR updates the version to ${VERSION}.

0 commit comments

Comments
 (0)