Merge branch 'main' into releases/v1

.github/build.sh

@@ -26,6 +26,7 @@ git commit -m "bump $MAJOR" || true
 git push origin "$CURRENT_BRANCH"
 
 # checkout releases branch
+git branch -D "releases/$MAJOR" || true
 git checkout -b "releases/$MAJOR" "origin/releases/$MAJOR" || git checkout -b "releases/$MAJOR" "$CURRENT_BRANCH"
 git merge -X theirs --no-ff -m "Merge branch '$CURRENT_BRANCH' into releases/$MAJOR" "$CURRENT_BRANCH" || true
 

.github/workflows/release.yml

@@ -23,6 +23,12 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Release tags must be reachable from HEAD because the bump comment uses `git tag --merged`:
+      # https://github.com/haya14busa/bump/blob/9ab5412f5d96eb624c7e8559acbb11330be9901a/main.go#L72
+      - name: checkout to release branch
+        run: |
+          git checkout -b "releases/$(cat .major-version)" "origin/releases/$(cat .major-version)"
+
       # Bump version on merging Pull Requests with specific labels.
       # (bump:major,bump:minor,bump:patch)
       - id: bumpr
@@ -34,6 +40,7 @@ jobs:
       - name: build the Docker Image
         if: "${{ !steps.bumpr.outputs.skip }}"
         run: |
+          git checkout main
           ./.github/build.sh
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -60,5 +67,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
+
+      # Release tags must be reachable from HEAD because the bump comment uses `git tag --merged`:
+      # https://github.com/haya14busa/bump/blob/9ab5412f5d96eb624c7e8559acbb11330be9901a/main.go#L72
+      - name: checkout to release branch
+        run: |
+          git checkout -b "releases/$(cat .major-version)" "origin/releases/$(cat .major-version)"
+
       - name: Post bumpr status comment
         uses: haya14busa/action-bumpr@v1

Dockerfile

@@ -23,11 +23,11 @@ RUN apk --update add git curl && \
   rm /var/cache/apk/*
 
 # install reviewdog
-ENV REVIEWDOG_VERSION=v0.14.1
+ENV REVIEWDOG_VERSION=v0.14.2
 RUN wget -O - -q https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh | sh -s -- -b /usr/local/bin/ ${REVIEWDOG_VERSION}
 
 # install actionlint
-ENV ACTIONLINT_VERSION=1.6.24
+ENV ACTIONLINT_VERSION=1.6.25
 ENV OSTYPE=linux-gnu
 RUN cd /usr/local/bin/ && wget -O - -q https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash | sh -s -- ${ACTIONLINT_VERSION}