From c92e4a2e97d0bc32f84774e657ec3d61d83b5288 Mon Sep 17 00:00:00 2001 From: Thomas Vaillant Date: Tue, 29 Oct 2024 20:48:22 +0100 Subject: [PATCH] chore: fix alpha releases and docker images --- .github/workflows/build.yml | 2 +- .github/workflows/post-release-docker-hub.yml | 2 +- CONTRIBUTING.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d83be752..446c866b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -251,7 +251,7 @@ jobs: git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' - name: release and publish to NPM - run: yarn lerna publish --yes --conventional-commits --conventional-prerelease --dist-tag alpha --exact --create-release github + run: yarn lerna publish --yes --conventional-commits --conventional-prerelease --conventional-bump-prerelease --dist-tag alpha --exact --create-release github env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/post-release-docker-hub.yml b/.github/workflows/post-release-docker-hub.yml index d0f3fa58..724f5526 100644 --- a/.github/workflows/post-release-docker-hub.yml +++ b/.github/workflows/post-release-docker-hub.yml @@ -20,4 +20,4 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: build and release the latest Docker image - run: make -C docker release version-tag latest-tag + run: make -C docker release version-tag branch-tag diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 90e64b67..2321cfea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -98,7 +98,7 @@ Log4brains follows a **simplified Git Flow** model. Here’s how the process wor This helps us get feedback from early adopters before merging changes into `stable`, and thus triggering a stable release. -7. **Releasing to Stable**: Once the `develop` branch is stable and tested, the maintainers will merge it into `stable`, and run manually `scripts/release.sh` to publish a new stable release to npm (TODO: should be automated in the future). +7. **Releasing to Stable**: Once the `develop` branch is stable and tested, the maintainers will merge it into `stable`, and run manually `scripts/release.sh` + `make -C docker release version-tag branch-tag latest-tag` to publish a new stable release to npm (TODO: should be automated in the future). ### Urgent hotfix specific case