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
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ concurrency:
jobs:
tests:
name: Lint
runs-on: ubuntu-latest
runs-on: blacksmith-4vcpu-ubuntu-2404

steps:
- uses: actions/checkout@v2
Expand Down
24 changes: 10 additions & 14 deletions .github/workflows/manual_prod_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
required: true
jobs:
docker_x86_release:
runs-on: ubuntu-latest
runs-on: blacksmith-4vcpu-ubuntu-2404
timeout-minutes: 120
env:
arch: amd64
Expand All @@ -25,21 +25,20 @@ jobs:
tags: |
type=raw,value=v${{ github.event.inputs.docker_tag }}_${{ env.arch }}
- uses: docker/setup-buildx-action@v2
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1

- uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- id: build
uses: docker/build-push-action@v3
uses: useblacksmith/build-push-action@v2
with:
push: true
tags: ${{ steps.meta.outputs.tags }}
platforms: linux/${{ env.arch }}
cache-from: type=gha
cache-to: type=gha,mode=max

docker_arm_release:
runs-on: arm-runner
Expand All @@ -64,15 +63,11 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- uses: docker/setup-buildx-action@v2
with:
driver: docker
driver-opts: |
image=moby/buildkit:master
network=host
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1

- id: build
uses: docker/build-push-action@v3
uses: useblacksmith/build-push-action@v2
with:
context: .
push: true
Expand All @@ -82,13 +77,14 @@ jobs:

merge_manifest:
needs: [docker_x86_release, docker_arm_release]
runs-on: ubuntu-latest
runs-on: blacksmith-4vcpu-ubuntu-2404
permissions:
contents: read
packages: write
id-token: write
steps:
- uses: docker/setup-buildx-action@v2
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1

- uses: docker/login-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
mirror:
runs-on: ubuntu-latest
runs-on: blacksmith-4vcpu-ubuntu-2404
permissions:
contents: read
packages: write
Expand Down
28 changes: 12 additions & 16 deletions .github/workflows/prod_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:

jobs:
release:
runs-on: ubuntu-latest
runs-on: blacksmith-4vcpu-ubuntu-2404
outputs:
published: ${{ steps.semantic.outputs.new_release_published }}
version: ${{ steps.semantic.outputs.new_release_version }}
Expand All @@ -30,7 +30,7 @@ jobs:

docker_x86_release:
needs: release
runs-on: ubuntu-latest
runs-on: blacksmith-4vcpu-ubuntu-2404
if: needs.release.outputs.published == 'true'
timeout-minutes: 120
env:
Expand All @@ -47,21 +47,20 @@ jobs:
type=raw,value=v${{ needs.release.outputs.version }}_${{ env.arch }}
type=raw,value=latest_${{ env.arch }}

- uses: docker/setup-buildx-action@v2
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1

- uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- id: build
uses: docker/build-push-action@v3
uses: useblacksmith/build-push-action@v2
with:
push: true
tags: ${{ steps.meta.outputs.tags }}
platforms: linux/${{ env.arch }}
cache-from: type=gha
cache-to: type=gha,mode=max

docker_arm_release:
needs: release
Expand Down Expand Up @@ -89,15 +88,11 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- uses: docker/setup-buildx-action@v2
with:
driver: docker
driver-opts: |
image=moby/buildkit:master
network=host
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1

- id: build
uses: docker/build-push-action@v3
uses: useblacksmith/build-push-action@v2
with:
context: .
push: true
Expand All @@ -107,13 +102,14 @@ jobs:

merge_manifest:
needs: [release, docker_x86_release, docker_arm_release]
runs-on: ubuntu-latest
runs-on: blacksmith-4vcpu-ubuntu-2404
permissions:
contents: read
packages: write
id-token: write
steps:
- uses: docker/setup-buildx-action@v2
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v1

- uses: docker/login-action@v2
with:
Expand Down Expand Up @@ -160,7 +156,7 @@ jobs:

update-branch-name:
needs: [release, docker_x86_release, docker_arm_release, merge_manifest]
runs-on: ubuntu-latest
runs-on: blacksmith-4vcpu-ubuntu-2404
steps:
- name: Checkout branch
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prod_linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
format:
name: Formatting Checks
runs-on: ubuntu-latest
runs-on: blacksmith-4vcpu-ubuntu-2404

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
jobs:
tests:
name: Tests
runs-on: ubuntu-latest
runs-on: blacksmith-8vcpu-ubuntu-2404

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version_updated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ name: Default Checks
jobs:
versions_updated:
name: Versions Updated
runs-on: ubuntu-latest
runs-on: blacksmith-4vcpu-ubuntu-2404
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand Down
5 changes: 1 addition & 4 deletions test/realtime/nodes_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ defmodule Realtime.NodesTest do
reject(&:syn.members/2)
end

test "on existing tenant id, returns the node for the region using syn", %{
tenant: tenant,
region: region
} do
test "on existing tenant id, returns the node for the region using syn", %{tenant: tenant, region: region} do
expected_nodes = [:tenant@closest1, :tenant@closest2]

expect(:syn, :members, fn RegionNodes, ^region ->
Expand Down