diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 2ee8b086..2a1b3ef0 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -56,12 +56,20 @@ jobs: echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT echo "new_tag=$NEW_TAG" >> $GITHUB_OUTPUT + - name: Install git-cliff + run: | + wget -q https://github.com/orhun/git-cliff/releases/download/v1.4.0/git-cliff-1.4.0-x86_64-unknown-linux-gnu.tar.gz + tar -xzf git-cliff-1.4.0-x86_64-unknown-linux-gnu.tar.gz + chmod +x git-cliff + sudo mv git-cliff /usr/local/bin/ + - name: Generate changelog id: changelog - uses: orhun/git-cliff-action@v3 - with: - config: .github/cliff.toml - args: --unreleased --strip header + run: | + CHANGELOG=$(git-cliff --config .github/cliff.toml --unreleased --strip header || echo "- 代码优化和改进") + echo "content<> $GITHUB_OUTPUT + echo "$CHANGELOG" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT - name: Check if there are changes to release id: check_changes diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index dc391f7a..b7d12fd6 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -49,7 +49,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} - type=sha,prefix={{branch}}- + type=sha type=raw,value=latest,enable={{is_default_branch}} - name: Build and push Docker image diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4756bf6a..03db4cde 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,12 +17,20 @@ jobs: with: fetch-depth: 0 + - name: Install git-cliff + run: | + wget -q https://github.com/orhun/git-cliff/releases/download/v1.4.0/git-cliff-1.4.0-x86_64-unknown-linux-gnu.tar.gz + tar -xzf git-cliff-1.4.0-x86_64-unknown-linux-gnu.tar.gz + chmod +x git-cliff + sudo mv git-cliff /usr/local/bin/ + - name: Generate changelog id: changelog - uses: orhun/git-cliff-action@v3 - with: - config: .github/cliff.toml - args: --latest --strip header + run: | + CHANGELOG=$(git-cliff --config .github/cliff.toml --latest --strip header) + echo "content<> $GITHUB_OUTPUT + echo "$CHANGELOG" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT - name: Create Release uses: softprops/action-gh-release@v1