diff --git a/.github/workflows/publish.yml b/.github/workflows/release-docker.yml similarity index 93% rename from .github/workflows/publish.yml rename to .github/workflows/release-docker.yml index 2d4c8a0..ad4ffc5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/release-docker.yml @@ -1,4 +1,4 @@ -name: publish +name: release-docker on: push: @@ -30,13 +30,13 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v1 with: registry: ghcr.io username: ${{ github.repository_owner }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index da39617..0575006 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: - name: Build changelog id: github_changelog run: | - changelog=$(git log $(git describe --tags --abbrev=0)..HEAD --no-merges --oneline) + changelog=$(git log $(git tag | tail -2 | head -1)..HEAD --no-merges --oneline) changelog="${changelog//'%'/'%25'}" changelog="${changelog//$'\n'/'%0A'}" changelog="${changelog//$'\r'/'%0D'}"