Skip to content

Small fixes to action server port parsing, github workflows #1827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dandelany merged 2 commits into from
May 6, 2026
Merged

Small fixes to action server port parsing, github workflows #1827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11229d6
small fixes to action server port parsing, github workflows
dandelany May 5, 2026
dc6e458
remove confusing radix arg from parseInt calls in action-server
dandelany May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/pgcmp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ on:
- "deployment/hasura/migrations/**"
- "deployment/postgres-init-db/sql/**"
- ".github/workflows/pgcmp.yml"
- ".github/workflows/scripts/compareDatabases*"
- ".github/scripts/compareDatabases*"
- ".github/scripts/explanations_*"
push:
paths:
- "deployment/hasura/migrations/**"
- "deployment/postgres-init-db/sql/**"
- ".github/workflows/pgcmp.yml"
- ".github/workflows/scripts/compareDatabases*"
- ".github/scripts/compareDatabases*"
- ".github/scripts/explanations_*"
branches:
- develop
- dev-[0-9]+.[0-9]+.[0-9]+
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:

scan:
runs-on: ubuntu-latest
needs: containers
needs: [init, containers]
Comment thread
dandelany marked this conversation as resolved.
if: needs.init.outputs.SHOULD_PUBLISH_IMAGES == 'true'
strategy:
matrix:
Expand All @@ -159,14 +159,20 @@ jobs:
steps:
- uses: actions/checkout@v6

- name: Extract metadata for ${{ matrix.image }}
id: metadata-step
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ matrix.image }}

- name: Scan ${{ matrix.image }} for vulnerabilities
# pinned to commit for release https://github.com/aquasecurity/trivy-action/releases/tag/v0.24.0
uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8
env:
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db
with:
image-ref: ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ matrix.image }}:develop
image-ref: ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ matrix.image }}:${{ steps.metadata-step.outputs.version }}
ignore-unfixed: true
exit-code: "1"
severity: "CRITICAL"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
**/target/*
.*.swp
.tags
.codex

### Build ###
.m2
Expand Down
2 changes: 1 addition & 1 deletion action-server/src/db.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class ActionsDbManager {
logger.info(`Creating PG pool`);
ActionsDbManager.pool = new pg.Pool({
host: AERIE_DB_HOST,
port: parseInt(AERIE_DB_PORT, 5432),
port: parseInt(AERIE_DB_PORT),
database: AERIE_DB,
user: ACTION_DB_USER,
password: ACTION_DB_PASSWORD,
Expand Down
2 changes: 1 addition & 1 deletion action-server/src/threads/worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function getDbPool() {

dbPool = new pg.Pool({
host: AERIE_DB_HOST,
port: parseInt(AERIE_DB_PORT, 5432),
port: parseInt(AERIE_DB_PORT),
database: AERIE_DB,
user: ACTION_DB_USER,
password: ACTION_DB_PASSWORD,
Expand Down
Loading