Use improved releasing

AnimMouse · Apr 3, 2021 · 900259e · 900259e
1 parent d304b42
commit 900259e
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 37 deletions.
diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml
@@ -2,7 +2,7 @@ name: Build FFmpeg on pull request
 on:
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   build:
@@ -33,30 +33,41 @@ jobs:
           name: ffmpeg-win64-nonfree
           path: ffmpeg-source/ffmpeg-win64-nonfree.7z
 
+      - name: Get current FFmpeg git commit SHA & date
+        id: git-sha-date
+        working-directory: ffmpeg-source
+        run: |
+          echo "::set-output name=git-sha::$(git rev-parse --short HEAD)"
+          echo "::set-output name=git-date::$(git log -1 --format=%ci)"
+          
+    outputs:
+      git-sha: ${{ steps.git-sha-date.outputs.git-sha }}
+      git-date: ${{ steps.git-sha-date.outputs.git-date }}
+
   release:
     needs: build
     runs-on: ubuntu-20.04
     steps:
       - name: Download all builds
         uses: actions/download-artifact@v2
 
-      - name: Create Release
-        id: create-release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Rename archive to include git commit SHA
+        working-directory: ffmpeg-win64-nonfree
+        run: mv ffmpeg-win64-nonfree.7z ffmpeg-${{needs.build.outputs.git-sha}}-win64-nonfree.7z
+
+      - name: Get current date & time
+        id: date-time
+        run: |
+          echo "::set-output name=date-time::$(date +'%Y-%m-%d %H:%M')"
+          echo "::set-output name=date-time-tag::$(date +'%Y-%m-%d-%H-%M')"
+          
+      - name: Release
+        uses: softprops/action-gh-release@v1
         with:
-          tag_name: "a#${{ github.run_number }}"
-          release_name: "Auto #${{ github.run_number }}"
-          draft: false
+          name: Auto ${{ steps.date-time.outputs.date-time }}
+          tag_name: a-${{ steps.date-time.outputs.date-time-tag }}
           prerelease: true
-
-      - name: Upload FFmpeg win64 nonfree Release Asset
-        uses: actions/upload-release-asset@v1
+          body: FFmpeg nonfree git-${{ needs.build.outputs.git-sha }} in ${{ needs.build.outputs.git-date }} built on ${{ steps.date-time.outputs.date-time }}
+          files: ffmpeg-win64-nonfree/ffmpeg-${{ needs.build.outputs.git-sha }}-win64-nonfree.7z
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_path: ffmpeg-win64-nonfree/ffmpeg-win64-nonfree.7z
-          asset_name: ffmpeg-win64-nonfree.7z
-          asset_content_type: application/x-7z-compressed
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build-on-push.yml b/.github/workflows/build-on-push.yml
@@ -2,7 +2,7 @@ name: Build FFmpeg on push
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:
@@ -33,30 +33,40 @@ jobs:
           name: ffmpeg-win64-nonfree
           path: ffmpeg-source/ffmpeg-win64-nonfree.7z
 
+      - name: Get current FFmpeg git commit SHA & date
+        id: git-sha-date
+        working-directory: ffmpeg-source
+        run: |
+          echo "::set-output name=git-sha::$(git rev-parse --short HEAD)"
+          echo "::set-output name=git-date::$(git log -1 --format=%ci)"
+          
+    outputs:
+      git-sha: ${{ steps.git-sha-date.outputs.git-sha }}
+      git-date: ${{ steps.git-sha-date.outputs.git-date }}
+
   release:
     needs: build
     runs-on: ubuntu-20.04
     steps:
       - name: Download all builds
         uses: actions/download-artifact@v2
 
-      - name: Create Release
-        id: create-release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: "#${{ github.run_number }}"
-          release_name: "#${{ github.run_number }}"
-          draft: false
-          prerelease: false
+      - name: Rename archive to include git commit SHA
+        working-directory: ffmpeg-win64-nonfree
+        run: mv ffmpeg-win64-nonfree.7z ffmpeg-${{needs.build.outputs.git-sha}}-win64-nonfree.7z
+
+      - name: Get current date & time
+        id: date-time
+        run: |
+          echo "::set-output name=date-time::$(date +'%Y-%m-%d %H:%M')"
+          echo "::set-output name=date-time-tag::$(date +'%Y-%m-%d-%H-%M')"
           
-      - name: Upload FFmpeg win64 nonfree Release Asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Release
+        uses: softprops/action-gh-release@v1
         with:
-          upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_path: ffmpeg-win64-nonfree/ffmpeg-win64-nonfree.7z
-          asset_name: ffmpeg-win64-nonfree.7z
-          asset_content_type: application/x-7z-compressed
+          name: ${{ steps.date-time.outputs.date-time }}
+          tag_name: ${{ steps.date-time.outputs.date-time-tag }}
+          body: FFmpeg nonfree git-${{ needs.build.outputs.git-sha }} in ${{ needs.build.outputs.git-date }} built on ${{ steps.date-time.outputs.date-time }}
+          files: ffmpeg-win64-nonfree/ffmpeg-${{ needs.build.outputs.git-sha }}-win64-nonfree.7z
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}