Skip to content

Commit 261a930

Browse files
woopwoop
committed
Fix GitHub Actions master build and release
1 parent 44ac221 commit 261a930

2 files changed

Lines changed: 12 additions & 13 deletions

File tree

‎.github/workflows/master_only.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,25 @@ jobs:
3030
docker push gcr.io/kf-feast/feast-${{ matrix.component }}:dev
3131
fi
3232
- name: Get version
33-
id: get_version
34-
run: echo ::set-output name=VERSION::${${GITHUB_REF/refs\/tags\//}:1}
33+
run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF#refs/*/}
3534
- name: Push versioned release
3635
run: |
37-
3836
# Build and push semver tagged commits
39-
rx='^([0-9]+\.){0,2}(\*|[0-9]+)$'
40-
if [[ ${{ steps.get_version.outputs.VERSION }} =~ $rx ]]; then
37+
rx='^v[0-9]+?\.[0-9]+?\.[0-9]+?$'
38+
if [[ "${RELEASE_VERSION}" =~ $rx ]]; then
39+
VERSION_WITHOUT_PREFIX=${RELEASE_VERSION:1}
4140
42-
docker tag gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_SHA} gcr.io/kf-feast/feast-${{ matrix.component }}:${{ steps.get_version.outputs.VERSION }}
43-
docker push gcr.io/kf-feast/feast-${{ matrix.component }}:${{ steps.get_version.outputs.VERSION }}
41+
docker tag gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_SHA} gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX}
42+
docker push gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX}
4443
4544
# Also update "latest" image if tagged commit is pushed to stable branch
4645
HIGHEST_SEMVER_TAG=$(git tag -l --sort -version:refname | head -n 1)
4746
echo "Only push to latest tag if tag is the highest semver version $HIGHEST_SEMVER_TAG"
4847
49-
if [ ${{ steps.get_version.outputs.VERSION }} == "${HIGHEST_SEMVER_TAG:1}" ]
48+
if [ "${VERSION_WITHOUT_PREFIX}" == "${HIGHEST_SEMVER_TAG:1}" ]
5049
then
51-
docker tag gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_SHA} gcr.io/kf-feast/feast-${{ matrix.component }}:${{ steps.get_version.outputs.VERSION }}
52-
docker push gcr.io/kf-feast/feast-${{ matrix.component }}:${{ steps.get_version.outputs.VERSION }}
50+
docker tag gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_SHA} gcr.io/kf-feast/feast-${{ matrix.component }}:latest
51+
docker push gcr.io/kf-feast/feast-${{ matrix.component }}:latest
5352
fi
5453
fi
5554

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ build-push-docker:
116116
@$(MAKE) build-docker registry=$(REGISTRY) version=$(VERSION)
117117
@$(MAKE) push-core-docker registry=$(REGISTRY) version=$(VERSION)
118118
@$(MAKE) push-serving-docker registry=$(REGISTRY) version=$(VERSION)
119-
@$(MAKE) push-ci-docker registry=$(REGISTRY)
119+
@$(MAKE) push-ci-docker registry=$(REGISTRY) version=$(VERSION)
120120

121121
build-docker: build-core-docker build-serving-docker build-ci-docker
122122

@@ -127,7 +127,7 @@ push-serving-docker:
127127
docker push $(REGISTRY)/feast-serving:$(VERSION)
128128

129129
push-ci-docker:
130-
docker push $(REGISTRY)/feast-ci:latest
130+
docker push $(REGISTRY)/feast-ci:$(VERSION)
131131

132132
push-jupyter-docker:
133133
docker push $(REGISTRY)/feast-jupyter:$(VERSION)
@@ -139,7 +139,7 @@ build-serving-docker:
139139
docker build -t $(REGISTRY)/feast-serving:$(VERSION) -f infra/docker/serving/Dockerfile .
140140

141141
build-ci-docker:
142-
docker build -t $(REGISTRY)/feast-ci:latest -f infra/docker/ci/Dockerfile .
142+
docker build -t $(REGISTRY)/feast-ci:$(VERSION) -f infra/docker/ci/Dockerfile .
143143

144144
build-jupyter-docker:
145145
docker build -t $(REGISTRY)/feast-jupyter:$(VERSION) -f infra/docker/jupyter/Dockerfile .

0 commit comments

Comments
 (0)