Skip to content

Commit

Permalink
Merge pull request #174 from balena-io/kyle/update-runners
Browse files Browse the repository at this point in the history
Remove runner distro requirement from build and test
  • Loading branch information
flowzone-app[bot] authored Feb 13, 2025
2 parents a44b857 + ba42624 commit 62989c7
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 15 deletions.
1 change: 1 addition & 0 deletions .github/actions/publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ runs:
steps:
- shell: bash
run: |
docker compose -f docker-compose.test.yml build
docker compose -f docker-compose.test.yml run sut \
'git config --global --add safe.directory $(pwd); make -j $(nproc) dep release'
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/flowzone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,3 @@ jobs:
github.event_name == 'pull_request_target'
)
secrets: inherit
with:
docker_images: ""
# open-balena-base/GLIBC compatibility
custom_test_matrix: >
{
"os": [["ubuntu-20.04"]]
}
docker_runs_on: |
{
"linux/amd64": ["ubuntu-20.04"]
}
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
FROM golang:1.23.5

# retain GLIBC compatibility with debian:bookworm used by open-balena-base
FROM golang:1.23.5-bookworm
5 changes: 2 additions & 3 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
---
version: "2.4"

services:
sut:
image: golang:1.23.5
build: .
image: sut
volumes:
- .:/go/src/github.com/balena-io/sshproxy
working_dir: /go/src/github.com/balena-io/sshproxy
Expand Down

0 comments on commit 62989c7

Please sign in to comment.