Skip to content

Commit dc8101b

Browse files
iambrianchaniambrianchan
authored
Merge pull request #4819 from coralproject/develop
v9.10.5
2 parents e1ca3eb + ac17cc4 commit dc8101b

File tree

6 files changed

+42
-38
lines changed

6 files changed

+42
-38
lines changed

‎.github/workflows/build-and-test.yml‎

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ env:
1010
IMAGE_CACHE_REPOSITORY: "coralproject/ci"
1111
DOCKERHUB_USERNAME: "coralproject"
1212

13+
permissions:
14+
id-token: write
15+
contents: read
16+
1317
jobs:
1418
build-and-test:
1519
name: Test
@@ -84,22 +88,25 @@ jobs:
8488
- uses: webfactory/[email protected]
8589
with:
8690
ssh-private-key: ${{ secrets.REPO_PATCHED_DEPLOY_KEY }}
87-
- name: Login to GAR
88-
uses: docker/login-action@v3
91+
- name: Authenticate to Google Cloud
92+
uses: google-github-actions/auth@v2
8993
with:
90-
registry: us-east1-docker.pkg.dev
91-
username: _json_key
92-
password: ${{ secrets.GAR_JSON_KEY }}
94+
project_id: the-coral-project
95+
workload_identity_provider: projects/418768622481/locations/global/workloadIdentityPools/github-actions/providers/github
96+
service_account: [email protected]
9397
- name: Login to Docker Hub
9498
uses: docker/login-action@v3
9599
with:
96100
username: ${{ env.DOCKERHUB_USERNAME }}
97101
password: ${{ secrets.DOCKERHUB_PASSWORD }}
102+
- name: Configure Docker GAR
103+
run: |
104+
gcloud auth configure-docker us-east1-docker.pkg.dev --quiet
98105
- name: Define SHORT_SHA with commit short sha
99106
run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
100107
# Build tag push the image after a merge to develop
101108
- name: Build and Push (develop)
102-
if: github.ref == 'refs/heads/develop' || github.ref
109+
if: github.ref == 'refs/heads/develop'
103110
run: |
104111
docker buildx build \
105112
--platform linux/amd64 \
@@ -136,17 +143,20 @@ jobs:
136143
- uses: webfactory/[email protected]
137144
with:
138145
ssh-private-key: ${{ secrets.REPO_PATCHED_DEPLOY_KEY }}
139-
- name: Login to GAR
140-
uses: docker/login-action@v3
146+
- name: Authenticate to Google Cloud
147+
uses: google-github-actions/auth@v2
141148
with:
142-
registry: us-east1-docker.pkg.dev
143-
username: _json_key
144-
password: ${{ secrets.GAR_JSON_KEY }}
149+
project_id: the-coral-project
150+
workload_identity_provider: projects/418768622481/locations/global/workloadIdentityPools/github-actions/providers/github
151+
service_account: [email protected]
145152
- name: Login to Docker Hub
146153
uses: docker/login-action@v3
147154
with:
148155
username: ${{ env.DOCKERHUB_USERNAME }}
149156
password: ${{ secrets.DOCKERHUB_PASSWORD }}
157+
- name: Configure Docker GAR
158+
run: |
159+
gcloud auth configure-docker us-east1-docker.pkg.dev --quiet
150160
- name: Define SHORT_SHA with commit short sha
151161
run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
152162
# Build for develop branch using native docker buildx
@@ -185,12 +195,15 @@ jobs:
185195
uses: actions/checkout@v4
186196
- name: Define SHORT_SHA with commit short sha
187197
run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
188-
- name: Login to GAR
189-
uses: docker/login-action@v3
198+
- name: Authenticate to Google Cloud
199+
uses: google-github-actions/auth@v2
190200
with:
191-
registry: us-east1-docker.pkg.dev
192-
username: _json_key
193-
password: ${{ secrets.GAR_JSON_KEY }}
201+
project_id: the-coral-project
202+
workload_identity_provider: projects/418768622481/locations/global/workloadIdentityPools/github-actions/providers/github
203+
service_account: [email protected]
204+
- name: Configure Docker GAR
205+
run: |
206+
gcloud auth configure-docker us-east1-docker.pkg.dev --quiet
194207
- name: Create and Push Manifest for develop branch
195208
if: github.ref == 'refs/heads/develop'
196209
run: |

‎.github/workflows/build-test-deploy.yml‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ env:
1414
SENTRY_ORG: "voxmedia"
1515
SENTRY_PROJECT: "coral"
1616

17+
permissions:
18+
id-token: write
19+
contents: read
20+
1721
jobs:
1822
build-and-test:
1923
name: Test
@@ -78,13 +82,6 @@ jobs:
7882
- uses: webfactory/[email protected]
7983
with:
8084
ssh-private-key: ${{ secrets.REPO_PATCHED_DEPLOY_KEY }}
81-
- name: Authenticate with GCP
82-
id: "auth"
83-
uses: "google-github-actions/auth@v2"
84-
with:
85-
credentials_json: "${{ secrets.GAR_JSON_KEY }}"
86-
- name: Set up Cloud SDK
87-
uses: "google-github-actions/setup-gcloud@v2"
8885
- name: Login to Docker Hub
8986
uses: docker/login-action@v3
9087
with:
@@ -153,13 +150,6 @@ jobs:
153150
- uses: webfactory/[email protected]
154151
with:
155152
ssh-private-key: ${{ secrets.REPO_PATCHED_DEPLOY_KEY }}
156-
- name: Authenticate with GCP
157-
id: "auth"
158-
uses: "google-github-actions/auth@v2"
159-
with:
160-
credentials_json: "${{ secrets.GAR_JSON_KEY }}"
161-
- name: Set up Cloud SDK
162-
uses: "google-github-actions/setup-gcloud@v2"
163153
- name: Login to Docker Hub
164154
uses: docker/login-action@v3
165155
with:
@@ -273,11 +263,12 @@ jobs:
273263
with:
274264
username: ${{ env.DOCKERHUB_USERNAME }}
275265
password: ${{ secrets.DOCKERHUB_PASSWORD }}
276-
- name: Authenticate with GCP
277-
id: "auth"
278-
uses: "google-github-actions/auth@v2"
266+
- name: Authenticate to Google Cloud
267+
uses: google-github-actions/auth@v2
279268
with:
280-
credentials_json: "${{ secrets.GAR_JSON_KEY }}"
269+
project_id: the-coral-project
270+
workload_identity_provider: projects/418768622481/locations/global/workloadIdentityPools/github-actions/providers/github
271+
service_account: [email protected]
281272
- name: Set up Cloud SDK
282273
uses: "google-github-actions/setup-gcloud@v2"
283274
- name: Define RC_TAG

‎client/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coralproject/talk",
3-
"version": "9.10.4",
3+
"version": "9.10.5",
44
"author": "The Coral Project",
55
"homepage": "https://coralproject.net/",
66
"sideEffects": [

‎common/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "common",
3-
"version": "9.10.4",
3+
"version": "9.10.5",
44
"description": "",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

‎config/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "common",
3-
"version": "9.10.4",
3+
"version": "9.10.5",
44
"description": "",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

‎server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coralproject/talk",
3-
"version": "9.10.4",
3+
"version": "9.10.5",
44
"author": "The Coral Project",
55
"homepage": "https://coralproject.net/",
66
"sideEffects": [

0 commit comments

Comments
 (0)