Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 12 additions & 8 deletions .github/workflows/docker-launchql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runner: ubuntu-latest # x86_64
- platform: linux/arm64
arch: arm64
runner: blacksmith-4vcpu-ubuntu-2404-arm # native arm
runner: ubuntu-24.04-arm # native arm
runs-on: ${{ matrix.runner }}

permissions:
Expand All @@ -44,8 +44,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to GHCR
if: github.event_name != 'pull_request'
Expand All @@ -72,28 +72,32 @@ jobs:
# do a quick amd64-only build without pushing.
- name: Build (no push, PR only)
if: github.event_name == 'pull_request' && matrix.platform == 'linux/amd64'
uses: useblacksmith/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
platforms: linux/amd64
push: false
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max

# For non-PR events, build one architecture per runner
# and push images by digest. These digests are later
# assembled into a multi-arch manifest.
- name: Build & push by digest
if: github.event_name != 'pull_request'
id: build
uses: useblacksmith/build-push-action@v2
uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile
platforms: ${{ matrix.platform }}
labels: ${{ steps.meta.outputs.labels }}
outputs: type=image,name=${{ env.REPO }}/${{ env.IMAGE_NAME }},push-by-digest=true,push=true
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Export digest
if: github.event_name != 'pull_request'
Expand All @@ -114,7 +118,7 @@ jobs:
# multi-arch manifest for each tag.
publish-constructive-manifest:
if: github.event_name != 'pull_request'
runs-on: blacksmith-4vcpu-ubuntu-2404
runs-on: ubuntu-latest
needs: build-push-constructive

permissions:
Expand All @@ -126,8 +130,8 @@ jobs:
IMAGE_NAME: constructive

steps:
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to GHCR
uses: docker/login-action@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ concurrency:
jobs:
build-push:
if: github.event_name != 'pull_request' || !github.event.pull_request.draft
runs-on: blacksmith-4vcpu-ubuntu-2404
runs-on: ubuntu-latest

permissions:
contents: read
Expand All @@ -67,8 +67,8 @@ jobs:
- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to GHCR
if: github.event_name != 'pull_request'
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ concurrency:

jobs:
constructive-tests:
runs-on: blacksmith-4vcpu-ubuntu-2404
container: pyramation/node-sqitch:20.12.0
runs-on: ubuntu-latest

strategy:
fail-fast: false
Expand All @@ -36,7 +35,7 @@ jobs:
env: {}
- package: packages/client
env:
TEST_DATABASE_URL: postgres://postgres:password@pg_db:5432/postgres
TEST_DATABASE_URL: postgres://postgres:password@localhost:5432/postgres
- package: postgres/pgsql-client
env: {}
- package: postgres/pgsql-test
Expand Down Expand Up @@ -97,11 +96,11 @@ jobs:
env: {}

env:
PGHOST: pg_db
PGHOST: localhost
PGPORT: 5432
PGUSER: postgres
PGPASSWORD: password
MINIO_ENDPOINT: http://minio_cdn:9000
MINIO_ENDPOINT: http://localhost:9000
AWS_ACCESS_KEY: minioadmin
AWS_SECRET_KEY: minioadmin
AWS_REGION: us-east-1
Expand Down Expand Up @@ -143,6 +142,11 @@ jobs:
- name: checkout
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'

- name: Setup pnpm
uses: pnpm/action-setup@v2
with:
Expand Down