Skip to content

Commit d3be730

Browse files
committed
Force complete rebuild monthly and fix
1 parent eb389db commit d3be730

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

.github/workflows/mpv.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ jobs:
2828
repo: "https://github.com/shinchiro/mpv-winbuild-cmake.git"
2929
- name: Get current time
3030
run: |
31-
export TZ='Asia/Shanghai'
3231
echo "long_time=$(date "+%Y-%m-%d %H:%M")" >> $GITHUB_ENV
3332
echo "short_time=$(date "+%Y-%m-%d")" >> $GITHUB_ENV
33+
echo "month=$(date "+%Y-%m")" >> $GITHUB_ENV
3434
echo "sha=$(expr substr "${{ steps.get_sha.outputs.sha }}" 1 7)" >> $GITHUB_ENV
3535
3636
- name: Cache
3737
uses: actions/cache@v2
3838
with:
3939
path: mpv-winbuild-cmake/build${{ matrix.bit }}
40-
key: ${{ runner.os }}-mpv-build${{ matrix.bit }}-${{ steps.build_sha.outputs.sha }}-${{ steps.get_sha.outputs.sha }}-${{ env.short_time }}
40+
key: ${{ runner.os }}-mpv-build${{ matrix.bit }}-${{ env.month }}-${{ steps.build_sha.outputs.sha }}-${{ env.short_time }}
4141
restore-keys: |
42-
${{ runner.os }}-mpv-build${{ matrix.bit }}-${{ steps.build_sha.outputs.sha }}-${{ steps.get_sha.outputs.sha }}
43-
${{ runner.os }}-mpv-build${{ matrix.bit }}-${{ steps.build_sha.outputs.sha }}
44-
${{ runner.os }}-mpv-build${{ matrix.bit }}-
42+
${{ runner.os }}-mpv-build${{ matrix.bit }}-${{ env.month }}-${{ steps.build_sha.outputs.sha }}
43+
${{ runner.os }}-mpv-build${{ matrix.bit }}-${{ env.month }}
44+
4545
- name: Build
4646
shell: bash
4747
run: |

.github/workflows/mpv_own.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ jobs:
2828
repo: "https://github.com/dyphire/mpv-winbuild-cmake.git"
2929
- name: Get current time
3030
run: |
31-
export TZ='Asia/Shanghai'
3231
echo "long_time=$(date "+%Y-%m-%d %H:%M")" >> $GITHUB_ENV
3332
echo "short_time=$(date "+%Y-%m-%d")" >> $GITHUB_ENV
33+
echo "month=$(date "+%Y-%m")" >> $GITHUB_ENV
3434
echo "sha=$(expr substr "${{ steps.get_sha.outputs.sha }}" 1 7)" >> $GITHUB_ENV
3535
3636
- name: Cache
3737
uses: actions/cache@v2
3838
with:
3939
path: mpv-winbuild-cmake/build${{ matrix.bit }}
40-
key: ${{ runner.os }}-mpv-build${{ matrix.bit }}-${{ steps.build_sha.outputs.sha }}-${{ steps.get_sha.outputs.sha }}-${{ env.short_time }}
40+
key: ${{ runner.os }}-mpv-build${{ matrix.bit }}-${{ env.month }}-${{ steps.build_sha.outputs.sha }}-${{ env.short_time }}
4141
restore-keys: |
42-
${{ runner.os }}-mpv-build${{ matrix.bit }}-${{ steps.build_sha.outputs.sha }}-${{ steps.get_sha.outputs.sha }}
43-
${{ runner.os }}-mpv-build${{ matrix.bit }}-${{ steps.build_sha.outputs.sha }}
44-
${{ runner.os }}-mpv-build${{ matrix.bit }}-
42+
${{ runner.os }}-mpv-build${{ matrix.bit }}-${{ env.month }}-${{ steps.build_sha.outputs.sha }}
43+
${{ runner.os }}-mpv-build${{ matrix.bit }}-${{ env.month }}
44+
4545
- name: Build
4646
shell: bash
4747
run: |

build.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
set -x
33

44
main() {
5-
export TZ='Asia/Shanghai'
65
dependency
76
local branch="gcc10"
87
dependency
98
if [ -d mpv-winbuild-cmake ] ; then
109
git clone https://github.com/shinchiro/mpv-winbuild-cmake.git temp
10+
shopt -s dotglob
1111
mv -f temp/* mpv-winbuild-cmake/
12+
shopt -u dotglob
1213
sudo rm -rf temp
1314
else
1415
git clone https://github.com/shinchiro/mpv-winbuild-cmake.git

build_own.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
set -x
33

44
main() {
5-
export TZ='Asia/Shanghai'
65
dependency
76
local branch="gcc10"
87
dependency
98
if [ -d mpv-winbuild-cmake ] ; then
109
git clone https://github.com/dyphire/mpv-winbuild-cmake.git temp
10+
shopt -s dotglob
1111
mv -f temp/* mpv-winbuild-cmake/
12+
shopt -u dotglob
1213
sudo rm -rf temp
1314
else
1415
git clone https://github.com/dyphire/mpv-winbuild-cmake.git

0 commit comments

Comments
 (0)