Skip to content

Commit

Permalink
simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
davidkarlsen committed Sep 8, 2023
1 parent a5da5ab commit 8c7b1a0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
run: |
echo "GIT_VERSION=$(git describe --tag --always)" >> $GITHUB_ENV
echo "VERSION=$(git describe --tag --always | sed s/^v//)" >> $GITHUB_ENV
echo "IMG=ghcr.io/${{ github.repository }}:${{ env.VERSION }}" >> $GITHUB_ENV
- name: golangci-lint
uses: reviewdog/action-golangci-lint@v2
Expand All @@ -42,12 +41,12 @@ jobs:

- name: build and push
run: |
make docker-buildx VERSION=${{ env.VERSION }} IMG=${{ env.IMG }}
make docker-buildx VERSION=${{ env.VERSION }}
- name: bundle
run: |
make bundle bundle-build bundle-push VERSION=${{ env.VERSION }} IMG=${{ env.IMG }}
make bundle bundle-build bundle-push VERSION=${{ env.VERSION }}
- name: catalog
run: |
make catalog-build catalog-push VERSION=${{ env.VERSION }} IMG=${{ env.IMG }}
make catalog-build catalog-push VERSION=${{ env.VERSION }}
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ endif
OPERATOR_SDK_VERSION ?= v1.31.0

# Image URL to use all building/pushing image targets
IMG ?= ghcr.io/davidkarlsen/flyway-operator:$(VERSION)
IMG ?= $(IMAGE_TAG_BASE):$(VERSION)
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.26.0

Expand Down

0 comments on commit 8c7b1a0

Please sign in to comment.