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

ci: publish container with all version tags TDE-527 #299

Merged
merged 11 commits into from
Jan 19, 2023
Merged

ci: publish container with all version tags TDE-527 #299

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4f06d4c
ci: publish container with all version tags
paulfouquet Jan 12, 2023
96ff2ae
ci: publish container with separate tags on release
paulfouquet Jan 15, 2023
f9b0dfa
ci: ignore CHANGELOG.md by Prettier to avoid release-please changelog…
paulfouquet Jan 15, 2023
0f9aa45
fix: .prettierignore misses a line return
paulfouquet Jan 16, 2023
c9b12c6
ci: remove duplicate publish release handled in containers.yml
paulfouquet Jan 16, 2023
9651e95
ci: check if it's a release using commit msg startsWith
paulfouquet Jan 16, 2023
9b328a5
ci: separate container tag/publish when release
paulfouquet Jan 17, 2023
f7c45bd
fix: container tag name
paulfouquet Jan 17, 2023
8eb7298
fix: eol
paulfouquet Jan 17, 2023
8dc550c
ci: fix tag order
paulfouquet Jan 17, 2023
1749036
ci: avoid tagging container twice in case of release
paulfouquet Jan 17, 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
18 changes: 14 additions & 4 deletions .github/workflows/containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,18 @@ jobs:

- name: Publish Containers
run: |
versions=("latest")
GIT_VERSION=$(git describe --tags --always --match 'v*')
docker tag topo-imagery ghcr.io/linz/topo-imagery:${GIT_VERSION}
docker push ghcr.io/linz/topo-imagery:${GIT_VERSION}
docker tag topo-imagery ghcr.io/linz/topo-imagery:latest
docker push ghcr.io/linz/topo-imagery:latest
if [ ${{(github.ref == 'refs/heads/master' && contains(github.event.head_commit.message, 'release:'))}} == true ]; then
Copy link
Collaborator Author

@paulfouquet paulfouquet Jan 16, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Have to use contains and not startsWith as when the release-please PR gets merged, the commit message not only contains the release: ... commit:

commit 68f58f69bbaec5a5895a1ef3572949ec516ac39a (HEAD -> master, tag: v0.4.0, origin/master, origin/HEAD)
Merge: 94fb2a7 1ca37f3
Author: paulfouquet <86932794+paulfouquet@users.noreply.github.com>
Date:   Mon Jan 16 10:54:41 2023 +1300

    Merge pull request #29 from paulfouquet/release-please--branches--master
    
    release: 0.4.0

Copy link
Member

Choose a reason for hiding this comment

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

your commit here looks to be a Merge commit, we do not allow merge commits in this repo.

When merging it should be merged as a Squash+Rebase, here is an example commit with a squash/rebase

linz/style-js@169ad32

so startsWith is what we want.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I haven't do my test in a exact same environment that's why...

XYZ_VERSION=${GIT_VERSION%-*-*}
XY_VERSION=${XYZ_VERSION%.*}
X_VERSION=${XY_VERSION%.*}
versions+=(${X_VERSION} ${XY_VERSION} ${XYZ_VERSION})
fi
versions+=(${GIT_VERSION})

for version in "${versions[@]}"; do
docker tag topo-imagery ghcr.io/linz/topo-imagery:$version
docker push ghcr.io/linz/topo-imagery:$version
echo "Tag $version created"
done
1 change: 1 addition & 0 deletions .github/workflows/release-please.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
with:
release-type: python
token: ${{ secrets.GITHUB_TOKEN }}
pull-request-title-pattern: "release: ${version}"

publish-release:
paulfouquet marked this conversation as resolved.
Show resolved Hide resolved
needs: release-please
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CHANGELOG.md
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is to avoid prettier to complain about * VS - in the changelog generated by release-please