Skip to content

Commit

Permalink
Merge pull request #1239 from brave-intl/master
Browse files Browse the repository at this point in the history
Prod Release 02-13-2025
  • Loading branch information
jlbyrne authored Feb 13, 2025
2 parents 32adb7b + 61d3a8d commit d769dad
Show file tree
Hide file tree
Showing 7 changed files with 963 additions and 522 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Setup Node.js environment
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
# Set always-auth in npmrc
always-auth: true
Expand All @@ -55,7 +55,7 @@ jobs:
- run: npm --version

- name: Docker Compose Install
uses: KengoTODA/actions-setup-docker-compose@818311a3c413a3a072378e424c020fafcbab9a49 # v1.1.0
uses: KengoTODA/actions-setup-docker-compose@aa468051c6851848da9bfe114e7eac913c0bf59c # v1.2.3
with:
version: '1.25.4'

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -50,7 +50,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
uses: github/codeql-action/autobuild@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -64,4 +64,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
4 changes: 2 additions & 2 deletions .github/workflows/generalized-deployments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
uses: aws-actions/configure-aws-credentials@4fc4975a852c8cd99761e2de1f4ba73402e44dd9 # v4.0.3
with:
role-to-assume: ${{ secrets.GDBP_AWS_IAM_ROLE_ARN }}
aws-region: us-west-2
- name: Generalized Deployments
uses: brave-intl/general-docker-build-pipeline-action@7eb4e5063b3051fb0eb49da64c5c623ef7813ef2 # v1.0.17
uses: brave-intl/general-docker-build-pipeline-action@539cd1f2cfb5d0df8ce9727842a9e9936e31c49d # v1.0.18
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20.18.1
FROM node:20.18.2

RUN apt-get update && apt-get install -y postgresql-client

Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
zookeeper:
container_name: zook1
hostname: zook1
image: confluentinc/cp-zookeeper:7.4.1
image: confluentinc/cp-zookeeper:7.8.0
ports:
- "2181:2181"
environment:
Expand All @@ -19,7 +19,7 @@ services:
kafka:
hostname: kafka1
container_name: kafka1
image: confluentinc/cp-kafka:7.4.1 # kafka version 2.2.1
image: confluentinc/cp-kafka:7.8.0 # kafka version 2.2.1
depends_on:
- zookeeper
ports:
Expand Down Expand Up @@ -58,7 +58,7 @@ services:

eyeshade-postgres:
container_name: eyeshade-postgres
image: postgres:16.2
image: postgres:16.6
ports:
- "3012:5432"
environment:
Expand Down
Loading

0 comments on commit d769dad

Please sign in to comment.