Skip to content
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

Jump to bottom

Move dev server image build into main CI workflow #141

Merged
merged 13 commits into from
Apr 21, 2023
Merged

Move dev server image build into main CI workflow #141

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5b088b8
Move dev server + sandbox image builds into main CI workflow
mark-idleman Apr 12, 2023
d2095dd
don't push main build image; try running unit tests with server-dev
mark-idleman Apr 14, 2023
dd4598f
move sandbox build back to func test flow
mark-idleman Apr 14, 2023
e930626
make sure sandbox build uses server-dev as base image (it's been push…
mark-idleman Apr 14, 2023
82089b2
try building base image with load: true
mark-idleman Apr 14, 2023
bb868a9
use load: true for both build steps, push to gcr separately
mark-idleman Apr 14, 2023
422d2c6
try setting buildx driver to docker
mark-idleman Apr 18, 2023
0a0364e
use base build image in unit test (access to mvn needed)
mark-idleman Apr 18, 2023
cfd1e53
fix comment
mark-idleman Apr 20, 2023
b0716a2
fix up comment + job name in func test flow
mark-idleman Apr 20, 2023
83fee45
comment
mark-idleman Apr 21, 2023
b47f09c
try removing explicit docker push step
mark-idleman Apr 21, 2023
7b239e0
Revert "try removing explicit docker push step"
mark-idleman Apr 21, 2023
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
21 changes: 21 additions & 0 deletions .github/workflows/build_test_push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,27 @@ jobs:
MININORCAL_OSM_PATH=${{ secrets.MININORCAL_OSM_PATH}}
MININORCAL_GTFS_PATH=${{ secrets.MININORCAL_GTFS_PATH}}

# Build the dev server + sandbox images used in functional test ahead of time
- name: build the server
uses: docker/build-push-action@v2
with:
context: .
push: true
file: Dockerfile.server
tags: "us.gcr.io/model-159019/gh:${{ github.sha }}-server-dev"
build-args: |
BASE_IMAGE=us.gcr.io/model-159019/gh:${{ github.sha }}-dev

- name: build the sandbox
uses: docker/build-push-action@v2
with:
context: .
push: true
file: Dockerfile.sandbox
tags: "us.gcr.io/model-159019/gh:${{ github.sha }}-server-sandbox"
build-args: |
BASE_IMAGE=us.gcr.io/model-159019/gh:${{ github.sha }}-dev

- name: run unit tests
run: |
docker run -t -d --name testrunner us.gcr.io/model-159019/gh:${{ github.sha }}-dev /bin/bash
Expand Down
20 changes: 0 additions & 20 deletions .github/workflows/functional-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,26 +85,6 @@ jobs:
- name: Set temp directory env variable
run: echo "TMPDIR=$(mktemp -d)" >> $GITHUB_ENV

- name: build the server
uses: docker/build-push-action@v2
with:
context: .
push: true
file: Dockerfile.server
tags: "us.gcr.io/model-159019/gh:${{ github.sha }}-server-dev"
build-args: |
BASE_IMAGE=us.gcr.io/model-159019/gh:${{ github.sha }}-dev

- name: build the sandbox
uses: docker/build-push-action@v2
with:
context: .
push: true
file: Dockerfile.sandbox
tags: "us.gcr.io/model-159019/gh:${{ github.sha }}-server-sandbox"
build-args: |
BASE_IMAGE=us.gcr.io/model-159019/gh:${{ github.sha }}-dev

- name: Install golang
uses: actions/setup-go@v2
with:
Expand Down