Skip to content

Commit 2b0f31d

Browse files
authored
Skip uploading images from ci workflow (#8)
* Skip uploading images from ci workflow * update region
1 parent 09f1f8b commit 2b0f31d

2 files changed

Lines changed: 12 additions & 64 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ on:
88

99
name: Continuous integration
1010

11-
env:
12-
BASE_IMAGE_NAME: livegrep/base
13-
INDEXER_IMAGE_NAME: livegrep/indexer
14-
NGINX_IMAGE_NAME: livegrep/nginx
15-
1611
jobs:
1712
ci:
1813
runs-on: ubuntu-24.04
@@ -29,15 +24,9 @@ jobs:
2924
bazel-disk-${{ runner.os }}-${{ hashFiles('MODULE.bazel', 'MODULE.bazel.lock') }}-
3025
bazel-disk-${{ runner.os }}-
3126
- name: bazel build
32-
id: build
33-
run: |
34-
bazel build //...
35-
echo "build_output_file_name=$(./package.sh)" >> $GITHUB_ENV
27+
run: bazel build //...
3628
- name: bazel test
3729
run: bazel test --test_arg=-test.v //...
38-
# Run after building so we can use BuildBuddys fetch cache rather than
39-
# first calling bazel fetch ourselves. If a Go file ins't formatted
40-
# corectly it will only take an additional minute or so for CI to fail.
4130
- name: gofmt
4231
run: |
4332
format_errors=$(bazel run @rules_go//go -- fmt ./...)
@@ -46,46 +35,3 @@ jobs:
4635
echo "$format_errors"
4736
exit 1
4837
fi
49-
- name: upload build output
50-
if: ${{ github.event_name == 'push' }}
51-
uses: actions/upload-artifact@v4
52-
with:
53-
name: "${{ env.build_output_file_name }}"
54-
path: "builds/${{ env.build_output_file_name }}.tgz"
55-
retention-days: 1
56-
- name: Build images
57-
if: ${{ github.event_name == 'push' }}
58-
run: |
59-
docker build -t $BASE_IMAGE_NAME --file docker/base/Dockerfile --build-arg "livegrep_version=$build_output_file_name" .
60-
docker build -t $INDEXER_IMAGE_NAME . --file docker/indexer/Dockerfile
61-
docker build -t $NGINX_IMAGE_NAME . --file docker/nginx/Dockerfile
62-
- name: Push images
63-
if: ${{ github.event_name == 'push' }}
64-
run: |
65-
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
66-
67-
BASE_IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$BASE_IMAGE_NAME
68-
INDEXER_IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$INDEXER_IMAGE_NAME
69-
NGINX_IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$NGINX_IMAGE_NAME
70-
71-
# tag each image with GHCRID:VERSION
72-
VERSION=$(git rev-parse HEAD | head -c10)
73-
docker tag $BASE_IMAGE_NAME $BASE_IMAGE_ID:$VERSION
74-
docker tag $INDEXER_IMAGE_NAME $INDEXER_IMAGE_ID:$VERSION
75-
docker tag $NGINX_IMAGE_NAME $NGINX_IMAGE_ID:$VERSION
76-
77-
# this workflow is running on "main" atm so always tag latest
78-
docker tag $BASE_IMAGE_NAME $BASE_IMAGE_ID:latest
79-
docker tag $INDEXER_IMAGE_NAME $INDEXER_IMAGE_ID:latest
80-
docker tag $NGINX_IMAGE_NAME $NGINX_IMAGE_ID:latest
81-
82-
docker push $NGINX_IMAGE_ID:$VERSION
83-
docker push $BASE_IMAGE_ID:$VERSION
84-
docker push $INDEXER_IMAGE_ID:$VERSION
85-
86-
# it seems like docker doesn't push all tags for an image, you need to
87-
# push each tag as if it were a seperate image -__-
88-
echo "Pushing latest images to test"
89-
docker push $NGINX_IMAGE_ID:latest
90-
docker push $BASE_IMAGE_ID:latest
91-
docker push $INDEXER_IMAGE_ID:latest

cloudbuild.yaml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ steps:
44
args:
55
- 'build'
66
- '-t'
7-
- 'us-west2-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$COMMIT_SHA'
7+
- 'us-central1-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$COMMIT_SHA'
88
- '-t'
9-
- 'us-west2-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$SHORT_SHA'
9+
- 'us-central1-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$SHORT_SHA'
1010
- '-t'
11-
- 'us-west2-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:latest'
11+
- 'us-central1-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:latest'
1212
- '.'
1313

1414
# Push all tags
1515
- name: 'gcr.io/cloud-builders/docker'
1616
args:
1717
- 'push'
1818
- '--all-tags'
19-
- 'us-west2-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image'
19+
- 'us-central1-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image'
2020

2121
# Deploy to Cloud Run service
2222
- name: 'gcr.io/cloud-builders/gcloud'
@@ -26,7 +26,8 @@ steps:
2626
- 'update'
2727
- 'livegrep-web-and-server'
2828
- '--region=us-west2'
29-
- '--image=us-west2-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$COMMIT_SHA'
29+
- '--project=snty-tools'
30+
- '--image=us-central1-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$COMMIT_SHA'
3031

3132
# Deploy to Cloud Run indexer job
3233
- name: 'gcr.io/cloud-builders/gcloud'
@@ -36,12 +37,13 @@ steps:
3637
- 'update'
3738
- 'livegrep-indexer'
3839
- '--region=us-west2'
39-
- '--image=us-west2-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$COMMIT_SHA'
40+
- '--project=snty-tools'
41+
- '--image=us-central1-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$COMMIT_SHA'
4042

4143
images:
42-
- 'us-west2-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$COMMIT_SHA'
43-
- 'us-west2-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$SHORT_SHA'
44-
- 'us-west2-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:latest'
44+
- 'us-central1-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$COMMIT_SHA'
45+
- 'us-central1-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$SHORT_SHA'
46+
- 'us-central1-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:latest'
4547

4648
timeout: 3600s
4749

0 commit comments

Comments
 (0)