diff --git a/.github/workflows/CD-Docker.yml b/.github/workflows/CD-Docker.yml index f6eca83..82360e3 100644 --- a/.github/workflows/CD-Docker.yml +++ b/.github/workflows/CD-Docker.yml @@ -13,13 +13,17 @@ jobs: - name: Checkout uses: actions/checkout@v2.3.3 + - name: Get release version + id: get-version + uses: dawidd6/action-get-tag@v1 + - name: Login run: docker login -u tyrrrz -p ${{ secrets.DOCKER_TOKEN }} - name: Build - run: docker build -t tyrrrz/discordchatexporter:${{ github.ref }} -t tyrrrz/discordchatexporter:stable . + run: docker build -t tyrrrz/discordchatexporter:${{ steps.get-version.outputs.tag }} -t tyrrrz/discordchatexporter:stable . - name: Deploy run: | - docker push tyrrrz/discordchatexporter:${{ github.ref }} + docker push tyrrrz/discordchatexporter:${{ steps.get-version.outputs.tag }} docker push tyrrrz/discordchatexporter:stable \ No newline at end of file diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 3cffab7..43adaf4 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -13,6 +13,10 @@ jobs: - name: Checkout uses: actions/checkout@v2.3.3 + - name: Get release version + id: get-version + uses: dawidd6/action-get-tag@v1 + - name: Install .NET (v3.1) uses: actions/setup-dotnet@v1.7.2 with: @@ -76,6 +80,6 @@ jobs: -Uri "${{ secrets.DISCORD_WEBHOOK }}" ` -Method "POST" ` -ContentType "application/json; charset=UTF-8" ` - -Body '{"content":"**DiscordChatExporter** new version released!\nRef: `${{ github.ref }}`\nChangelog: "}' ` + -Body '{"content":"**DiscordChatExporter** new version released!\nVersion: `${{ steps.get-version.outputs.tag }}`\nChangelog: "}' ` -UseBasicParsing shell: pwsh