Skip to content

Commit 999ceaf

Browse files
tessalttessalt
authored
Merge pull request #4786 from coralproject/develop
v9.9.5
2 parents 3b4e0da + 04432e5 commit 999ceaf

File tree

8 files changed

+30
-25
lines changed

8 files changed

+30
-25
lines changed

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@ env:
1313
jobs:
1414
build-and-test:
1515
name: Build and Test
16-
runs-on: coral-ci
16+
runs-on: ubuntu-24.04-arm
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
- name: Set up Docker Buildx
2121
uses: docker/setup-buildx-action@v3
22-
- uses: webfactory/ssh-agent@v0.7.0
22+
- uses: webfactory/ssh-agent@v0.9.0
2323
with:
2424
ssh-private-key: ${{ secrets.REPO_PATCHED_DEPLOY_KEY }}
2525
- name: Login to GAR
26-
uses: docker/login-action@v2
26+
uses: docker/login-action@v3
2727
with:
2828
registry: us-east1-docker.pkg.dev
2929
username: _json_key
3030
password: ${{ secrets.GAR_JSON_KEY }}
3131
- name: Login to Docker Hub
32-
uses: docker/login-action@v2
32+
uses: docker/login-action@v3
3333
with:
3434
username: ${{ env.DOCKERHUB_USERNAME }}
3535
password: ${{ secrets.DOCKERHUB_PASSWORD }}
3636
- name: Define SHORT_SHA with commit short sha
3737
run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
3838
- name: Setup Node18.x
39-
uses: actions/setup-node@v3
39+
uses: actions/setup-node@v4
4040
with:
4141
node-version: "18.16.x"
4242
- name: Install pnpm 8
@@ -85,9 +85,10 @@ jobs:
8585
run: cd client && ./node_modules/.bin/bundlesize --enable-github-checks
8686
# Build tag push the image after a merge to develop
8787
- name: Build, Tag, Push
88-
uses: docker/build-push-action@v5
88+
uses: docker/build-push-action@v6
8989
if: github.ref == 'refs/heads/develop'
9090
with:
91+
platforms: linux/arm64
9192
push: true
9293
tags: ${{ env.IMAGE_REPOSITORY }}:develop-latest
9394
build-args: |
@@ -96,9 +97,10 @@ jobs:
9697
cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-develop
9798
# Build tag push the release candidate image when the branch name begins with release-
9899
- name: Build, Tag, Push RC
99-
uses: docker/build-push-action@v5
100+
uses: docker/build-push-action@v6
100101
if: startsWith( github.ref, 'refs/heads/release-')
101102
with:
103+
platforms: linux/arm64
102104
push: true
103105
tags: ${{ env.IMAGE_REPOSITORY }}:${{ github.ref_name }}-${{ env.SHORT_SHA }}
104106
build-args: |

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@ env:
1717
jobs:
1818
build-and-test:
1919
name: Build, Test, and Deploy
20-
runs-on: coral-ci
20+
runs-on: ubuntu-24.04-arm
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
- name: Set up Docker Buildx
2525
uses: docker/setup-buildx-action@v3
26-
- uses: webfactory/ssh-agent@v0.7.0
26+
- uses: webfactory/ssh-agent@v0.9.0
2727
with:
2828
ssh-private-key: ${{ secrets.REPO_PATCHED_DEPLOY_KEY }}
2929
- name: Authenticate with GCP
3030
id: "auth"
31-
uses: "google-github-actions/auth@v1"
31+
uses: "google-github-actions/auth@v2"
3232
with:
3333
credentials_json: "${{ secrets.GAR_JSON_KEY }}"
3434
- name: Set up Cloud SDK
35-
uses: "google-github-actions/setup-gcloud@v1"
35+
uses: "google-github-actions/setup-gcloud@v2"
3636
- name: Login to Docker Hub
37-
uses: docker/login-action@v2
37+
uses: docker/login-action@v3
3838
with:
3939
username: ${{ env.DOCKERHUB_USERNAME }}
4040
password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -43,7 +43,7 @@ jobs:
4343
- name: Define RC_TAG
4444
run: echo "RC_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
4545
- name: Setup Node18.x
46-
uses: actions/setup-node@v3
46+
uses: actions/setup-node@v4
4747
with:
4848
node-version: "18.16.x"
4949
- name: Install pnpm 8
@@ -98,26 +98,29 @@ jobs:
9898
echo "MINOR_TAG=${MAJOR}.${MINOR}" >> $GITHUB_ENV
9999
echo "PATCH_TAG=${MAJOR}.${MINOR}.${PATCH}" >> $GITHUB_ENV
100100
- name: Build, Tag, Push Major Tag
101-
uses: docker/build-push-action@v5
101+
uses: docker/build-push-action@v6
102102
with:
103+
platforms: linux/arm64
103104
push: true
104105
tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MAJOR_TAG }}
105106
build-args: |
106107
REVISION_HASH=${{ env.GITHUB_SHA }}
107108
cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-major
108109
cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-major
109110
- name: Build, Tag, Push Minor Tag
110-
uses: docker/build-push-action@v5
111+
uses: docker/build-push-action@v6
111112
with:
113+
platforms: linux/arm64
112114
push: true
113115
tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MINOR_TAG }}
114116
build-args: |
115117
REVISION_HASH=${{ env.GITHUB_SHA }}
116118
cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-minor
117119
cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-minor
118120
- name: Build, Tag, Push Patch Tag
119-
uses: docker/build-push-action@v4
121+
uses: docker/build-push-action@v6
120122
with:
123+
platforms: linux/arm64
121124
push: true
122125
tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.PATCH_TAG }}
123126
build-args: |

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM node:18-alpine
33
ENV NODE_OPTIONS="--max-old-space-size=8192 --openssl-legacy-provider --no-experimental-fetch"
44

55
# Install build dependancies.
6-
RUN apk --no-cache --update add g++ make git python3 py3-pip py3-setuptools \
6+
RUN apk --no-cache --update add g++ make git python3 py3-pip py3-setuptools linux-headers \
77
&& rm -rf /var/cache/apk/*
88

99
RUN npm install -g [email protected]

‎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.9.4",
3+
"version": "9.9.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.9.4",
3+
"version": "9.9.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.9.4",
3+
"version": "9.9.5",
44
"description": "",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

‎docs/docs/installation.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ reimagines moderation, comment display, and conversation. Use Coral to add
1111
smarter, safer discussions to your site without giving away your data.
1212

1313
More than 500 news sites in 28 countries trust Coral to power their on-site
14-
communities, including The Washington Post, The Financial Times, Wired, The Hindu, and Foreign Policy. [Read more about Coral here](https://coralproject.net/).
14+
communities, including The Washington Post, The Financial Times, The Hindu, and Foreign Policy. [Read more about Coral here](https://coralproject.net/).
1515

1616
Built with ❤️ by Coral by [Vox Media](https://product.voxmedia.com/).
1717

1818
## Requirements
1919

20-
- MongoDB ^4.2
20+
- MongoDB ^8.0.3
2121
- Redis ^3.2
2222
- NodeJS ^18.16.0
2323
- PNPM ^8.0

‎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.9.4",
3+
"version": "9.9.5",
44
"author": "The Coral Project",
55
"homepage": "https://coralproject.net/",
66
"sideEffects": [

0 commit comments

Comments
 (0)