Skip to content

Commit d0d9e5d

Browse files
AnimMouseAnimMouse
committed
Append helper git SHA on filename
1 parent bbb968d commit d0d9e5d

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎.github/workflows/build-on-pull-request.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,19 @@ jobs:
5858
- name: Upload FFmpeg ${{ matrix.os }} nonfree
5959
uses: actions/upload-artifact@v2
6060
with:
61-
name: ffmpeg-${{ steps.git-sha-date.outputs.git-sha }}-${{ matrix.os }}-nonfree
61+
name: ffmpeg-${{ steps.git-sha-date.outputs.git-sha }}-${{ steps.helper-git-sha.outputs.git-sha }}-${{ matrix.os }}-nonfree
6262
path: ffmpeg-source/ffmpeg.exe
6363

6464
- name: Upload FFprobe ${{ matrix.os }} nonfree
6565
uses: actions/upload-artifact@v2
6666
with:
67-
name: ffprobe-${{ steps.git-sha-date.outputs.git-sha }}-${{ matrix.os }}-nonfree
67+
name: ffprobe-${{ steps.git-sha-date.outputs.git-sha }}-${{ steps.helper-git-sha.outputs.git-sha }}-${{ matrix.os }}-nonfree
6868
path: ffmpeg-source/ffprobe.exe
6969

7070
- name: Upload FFplay ${{ matrix.os }} nonfree
7171
uses: actions/upload-artifact@v2
7272
with:
73-
name: ffplay-${{ steps.git-sha-date.outputs.git-sha }}-${{ matrix.os }}-nonfree
73+
name: ffplay-${{ steps.git-sha-date.outputs.git-sha }}-${{ steps.helper-git-sha.outputs.git-sha }}-${{ matrix.os }}-nonfree
7474
path: ffmpeg-source/ffplay.exe
7575

7676
outputs:
@@ -92,26 +92,26 @@ jobs:
9292
- name: Download FFmpeg ${{ matrix.os }} nonfree
9393
uses: actions/download-artifact@v2
9494
with:
95-
name: ffmpeg-${{ needs.build.outputs.git-sha }}-${{ matrix.os }}-nonfree
95+
name: ffmpeg-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-${{ matrix.os }}-nonfree
9696

9797
- name: Download FFprobe ${{ matrix.os }} nonfree
9898
uses: actions/download-artifact@v2
9999
with:
100-
name: ffprobe-${{ needs.build.outputs.git-sha }}-${{ matrix.os }}-nonfree
100+
name: ffprobe-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-${{ matrix.os }}-nonfree
101101

102102
- name: Download FFplay ${{ matrix.os }} nonfree
103103
uses: actions/download-artifact@v2
104104
with:
105-
name: ffplay-${{ needs.build.outputs.git-sha }}-${{ matrix.os }}-nonfree
105+
name: ffplay-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-${{ matrix.os }}-nonfree
106106

107107
- name: 7-Zip FFmpeg ${{ matrix.os }} nonfree
108-
run: 7z a ffmpeg-${{needs.build.outputs.git-sha}}-${{matrix.os}}-nonfree.7z ffmpeg.exe ffprobe.exe ffplay.exe -mx9
108+
run: 7z a ffmpeg-${{needs.build.outputs.git-sha}}-${{needs.build.outputs.helper-git-sha}}-${{matrix.os}}-nonfree.7z ffmpeg.exe ffprobe.exe ffplay.exe -mx9
109109

110110
- name: Upload FFmpeg archive ${{ matrix.os }} nonfree
111111
uses: actions/upload-artifact@v2
112112
with:
113-
name: ffmpeg-archive-${{ needs.build.outputs.git-sha }}-${{ matrix.os }}-nonfree
114-
path: ffmpeg-${{ needs.build.outputs.git-sha }}-${{ matrix.os }}-nonfree.7z
113+
name: ffmpeg-archive-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-${{ matrix.os }}-nonfree
114+
path: ffmpeg-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-${{ matrix.os }}-nonfree.7z
115115

116116
release:
117117
needs: [build, archive]
@@ -120,12 +120,12 @@ jobs:
120120
- name: Download FFmpeg archive win64
121121
uses: actions/download-artifact@v2
122122
with:
123-
name: ffmpeg-archive-${{ needs.build.outputs.git-sha }}-win64-nonfree
123+
name: ffmpeg-archive-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-win64-nonfree
124124

125125
- name: Download FFmpeg archive win32
126126
uses: actions/download-artifact@v2
127127
with:
128-
name: ffmpeg-archive-${{ needs.build.outputs.git-sha }}-win32-nonfree
128+
name: ffmpeg-archive-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-win32-nonfree
129129

130130
- name: Release
131131
uses: softprops/action-gh-release@v1
@@ -137,7 +137,7 @@ jobs:
137137
FFmpeg nonfree git-${{ needs.build.outputs.git-sha }} in ${{ needs.build.outputs.git-date }} built on ${{ needs.build.outputs.date-time-after }} started at ${{ needs.build.outputs.date-time-before }}
138138
Using ffmpeg-windows-build-helpers git-${{ needs.build.outputs.helper-git-sha }}
139139
files: |
140-
ffmpeg-${{ needs.build.outputs.git-sha }}-win64-nonfree.7z
141-
ffmpeg-${{ needs.build.outputs.git-sha }}-win32-nonfree.7z
140+
ffmpeg-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-win64-nonfree.7z
141+
ffmpeg-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-win32-nonfree.7z
142142
env:
143-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
143+
GITHUB_TOKEN: ${{ github.token }}

‎.github/workflows/build-on-push.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@ jobs:
5656
- name: Upload FFmpeg ${{ matrix.os }} nonfree
5757
uses: actions/upload-artifact@v2
5858
with:
59-
name: ffmpeg-${{ steps.git-sha-date.outputs.git-sha }}-${{ matrix.os }}-nonfree
59+
name: ffmpeg-${{ steps.git-sha-date.outputs.git-sha }}-${{ steps.helper-git-sha.outputs.git-sha }}-${{ matrix.os }}-nonfree
6060
path: ffmpeg-source/ffmpeg.exe
6161

6262
- name: Upload FFprobe ${{ matrix.os }} nonfree
6363
uses: actions/upload-artifact@v2
6464
with:
65-
name: ffprobe-${{ steps.git-sha-date.outputs.git-sha }}-${{ matrix.os }}-nonfree
65+
name: ffprobe-${{ steps.git-sha-date.outputs.git-sha }}-${{ steps.helper-git-sha.outputs.git-sha }}-${{ matrix.os }}-nonfree
6666
path: ffmpeg-source/ffprobe.exe
6767

6868
- name: Upload FFplay ${{ matrix.os }} nonfree
6969
uses: actions/upload-artifact@v2
7070
with:
71-
name: ffplay-${{ steps.git-sha-date.outputs.git-sha }}-${{ matrix.os }}-nonfree
71+
name: ffplay-${{ steps.git-sha-date.outputs.git-sha }}-${{ steps.helper-git-sha.outputs.git-sha }}-${{ matrix.os }}-nonfree
7272
path: ffmpeg-source/ffplay.exe
7373

7474
outputs:
@@ -90,26 +90,26 @@ jobs:
9090
- name: Download FFmpeg ${{ matrix.os }} nonfree
9191
uses: actions/download-artifact@v2
9292
with:
93-
name: ffmpeg-${{ needs.build.outputs.git-sha }}-${{ matrix.os }}-nonfree
93+
name: ffmpeg-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-${{ matrix.os }}-nonfree
9494

9595
- name: Download FFprobe ${{ matrix.os }} nonfree
9696
uses: actions/download-artifact@v2
9797
with:
98-
name: ffprobe-${{ needs.build.outputs.git-sha }}-${{ matrix.os }}-nonfree
98+
name: ffprobe-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-${{ matrix.os }}-nonfree
9999

100100
- name: Download FFplay ${{ matrix.os }} nonfree
101101
uses: actions/download-artifact@v2
102102
with:
103-
name: ffplay-${{ needs.build.outputs.git-sha }}-${{ matrix.os }}-nonfree
103+
name: ffplay-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-${{ matrix.os }}-nonfree
104104

105105
- name: 7-Zip FFmpeg ${{ matrix.os }} nonfree
106-
run: 7z a ffmpeg-${{needs.build.outputs.git-sha}}-${{matrix.os}}-nonfree.7z ffmpeg.exe ffprobe.exe ffplay.exe -mx9
106+
run: 7z a ffmpeg-${{needs.build.outputs.git-sha}}-${{needs.build.outputs.helper-git-sha}}-${{matrix.os}}-nonfree.7z ffmpeg.exe ffprobe.exe ffplay.exe -mx9
107107

108108
- name: Upload FFmpeg archive ${{ matrix.os }} nonfree
109109
uses: actions/upload-artifact@v2
110110
with:
111-
name: ffmpeg-archive-${{ needs.build.outputs.git-sha }}-${{ matrix.os }}-nonfree
112-
path: ffmpeg-${{ needs.build.outputs.git-sha }}-${{ matrix.os }}-nonfree.7z
111+
name: ffmpeg-archive-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-${{ matrix.os }}-nonfree
112+
path: ffmpeg-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-${{ matrix.os }}-nonfree.7z
113113

114114
release:
115115
needs: [build, archive]
@@ -118,12 +118,12 @@ jobs:
118118
- name: Download FFmpeg archive win64
119119
uses: actions/download-artifact@v2
120120
with:
121-
name: ffmpeg-archive-${{ needs.build.outputs.git-sha }}-win64-nonfree
121+
name: ffmpeg-archive-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-win64-nonfree
122122

123123
- name: Download FFmpeg archive win32
124124
uses: actions/download-artifact@v2
125125
with:
126-
name: ffmpeg-archive-${{ needs.build.outputs.git-sha }}-win32-nonfree
126+
name: ffmpeg-archive-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-win32-nonfree
127127

128128
- name: Release
129129
uses: softprops/action-gh-release@v1
@@ -134,10 +134,10 @@ jobs:
134134
FFmpeg nonfree git-${{ needs.build.outputs.git-sha }} in ${{ needs.build.outputs.git-date }} built on ${{ needs.build.outputs.date-time-after }} started at ${{ needs.build.outputs.date-time-before }}
135135
Using ffmpeg-windows-build-helpers git-${{ needs.build.outputs.helper-git-sha }}
136136
files: |
137-
ffmpeg-${{ needs.build.outputs.git-sha }}-win64-nonfree.7z
138-
ffmpeg-${{ needs.build.outputs.git-sha }}-win32-nonfree.7z
137+
ffmpeg-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-win64-nonfree.7z
138+
ffmpeg-${{ needs.build.outputs.git-sha }}-${{ needs.build.outputs.helper-git-sha }}-win32-nonfree.7z
139139
env:
140-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
140+
GITHUB_TOKEN: ${{ github.token }}
141141

142142
delete_old:
143143
name: Delete older pre-releases
@@ -146,7 +146,7 @@ jobs:
146146
- name: Delete older pre-releases
147147
uses: dev-drprasad/delete-older-releases@v0.2.0
148148
env:
149-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
149+
GITHUB_TOKEN: ${{ github.token }}
150150
with:
151151
keep_latest: 1
152152
delete_tags: true

0 commit comments

Comments
 (0)