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.

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

[CI-only] Update dev image tagging on 1.11.x #13539

Merged
merged 4 commits into from
Jun 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 10 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ jobs:
env:
repo: ${{github.event.repository.name}}
version: ${{needs.get-product-version.outputs.product-version}}

steps:
- uses: actions/checkout@v2

Expand All @@ -248,6 +248,13 @@ jobs:
with:
platforms: all

# Strip everything but MAJOR.MINOR from the version string and add a `-dev` suffix
# This naming convention will be used ONLY for per-commit dev images
- name: Set docker dev tag
run: |
version="${{ env.version }}"
echo "dev_tag=${version%.*}-dev" >> $GITHUB_ENV

- name: Docker Build (Action)
uses: hashicorp/actions-docker-build@v1
with:
Expand All @@ -258,8 +265,8 @@ jobs:
docker.io/hashicorp/${{env.repo}}:${{env.version}}
public.ecr.aws/hashicorp/${{env.repo}}:${{env.version}}
dev_tags: |
docker.io/hashicorppreview/${{ env.repo }}:${{ env.version }}
docker.io/hashicorppreview/${{ env.repo }}:${{ env.version }}-${{ github.sha }}
docker.io/hashicorppreview/${{ env.repo }}:${{ env.dev_tag }}
docker.io/hashicorppreview/${{ env.repo }}:${{ env.dev_tag }}-${{ github.sha }}
smoke_test: .github/scripts/verify_docker.sh v${{ env.version }}

build-docker-redhat:
Expand Down
4 changes: 2 additions & 2 deletions version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ var (
// compiler.
GitCommit string

// The main version number that is being run at the moment.
// The next version number that will be released in this series.
//
// Version must conform to the format expected by github.com/hashicorp/go-version
// for tests to work.
Version = "1.11.3"
Version = "1.11.7"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the current version of consul on release/1.11.x is 1.11.6, this has been bumped to the NEXT version, 1.11.7. After 1.11.7 is released, this version should be bumped to 1.11.8 if there will be another patch in this series.


// A pre-release marker for the version. If this is "" (empty string)
// then it means that it is a final release. Otherwise, this is a pre-release
Expand Down