Skip to content

Commit 35a685f

Browse files
KobeArthurScofieldKobeArthurScofield
authored
Schedule adjustment; minor tweaks
1 parent 5feb850 commit 35a685f

File tree

7 files changed

+58
-69
lines changed

7 files changed

+58
-69
lines changed

‎.github/workflows/release.yml‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,22 @@ jobs:
6666
cd ..
6767
6868
- name: Copy binaries into bin
69+
if: matrix.goos != 'linux' || matrix.goarch != 'amd64'
6970
shell: bash
7071
run: |
7172
cd ./bin
72-
DIRS=(windows_amd64 windows_386 windows_arm64 linux_386 linux_arm64)
73-
for DIR in "${DIRS[@]}"
74-
do
75-
if [ -d "${DIR}" ]; then
76-
echo "Found ${DIR} copying binaries"
77-
rm go*
78-
for BINARY in "${DIR}"/*
79-
do
80-
echo "mv ./${BINARY} ./"
81-
mv ./${BINARY} ./
82-
done
83-
rm -r "${DIR}"
84-
rm -r ../pkg/tool/linux_amd64/
85-
fi
86-
done
73+
DIR="${GOOS}_${GOARCH}"
74+
if [ -d "${DIR}" ]; then
75+
echo "Found ${DIR} copying binaries"
76+
rm ./go*
77+
for BINARY in "${DIR}"/*
78+
do
79+
echo "mv ./${BINARY} ./"
80+
mv ./${BINARY} ./
81+
done
82+
rm -r ./"${DIR}"
83+
rm -r ../pkg/tool/linux_amd64/
84+
fi
8785
cd ..
8886
ls -al ./bin
8987

‎.github/workflows/test-go1_22.yml‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ name: Build patched Go 1.22 for tests
33
on:
44
workflow_dispatch:
55
#schedule:
6-
#- cron: '0 0 1-20 * 2,4,6'
7-
#- cron: '0 0 21-31 * 6'
6+
#- cron: '0 0 * * 4,6'
87
push:
98
branches:
109
- build
@@ -72,23 +71,22 @@ jobs:
7271
cd ..
7372
7473
- name: Copy binaries into bin
74+
if: matrix.goos != 'linux' || matrix.goarch != 'amd64'
7575
shell: bash
7676
run: |
7777
cd ./bin
78-
DIRS=(windows_amd64 windows_386)
79-
for DIR in "${DIRS[@]}"
80-
do
81-
if [ -d "${DIR}" ]; then
82-
echo "Found ${DIR} copying binaries"
83-
rm go*
84-
for BINARY in "${DIR}"/*
85-
do
86-
echo "mv ./${BINARY} ./"
87-
mv ./${BINARY} ./
88-
done
89-
rm -r "${DIR}"
90-
fi
91-
done
78+
DIR="${GOOS}_${GOARCH}"
79+
if [ -d "${DIR}" ]; then
80+
echo "Found ${DIR} copying binaries"
81+
rm ./go*
82+
for BINARY in "${DIR}"/*
83+
do
84+
echo "mv ./${BINARY} ./"
85+
mv ./${BINARY} ./
86+
done
87+
rm -r ./"${DIR}"
88+
rm -r ../pkg/tool/linux_amd64/
89+
fi
9290
cd ..
9391
ls -al ./bin
9492

‎.github/workflows/test-go1_22_src.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ name: Builder test Go 1.22
33
on:
44
workflow_dispatch:
55
#schedule:
6-
#- cron: '5 0 1-20 * 2,4,6'
7-
#- cron: '5 0 21-31 * 6'
6+
#- cron: '5 0 * * 4,6'
87
push:
98
branches:
109
- build

‎.github/workflows/test-go1_23.yml‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ name: Build patched Go 1.23 for tests
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: '10 0 1-20 * 2,4,6'
7-
- cron: '10 0 21-31 * 6'
6+
- cron: '10 0 * * 4,6'
87
push:
98
branches:
109
- build
@@ -72,23 +71,22 @@ jobs:
7271
cd ..
7372
7473
- name: Copy binaries into bin
74+
if: matrix.goos != 'linux' || matrix.goarch != 'amd64'
7575
shell: bash
7676
run: |
7777
cd ./bin
78-
DIRS=(windows_amd64 windows_386)
79-
for DIR in "${DIRS[@]}"
80-
do
81-
if [ -d "${DIR}" ]; then
82-
echo "Found ${DIR} copying binaries"
83-
rm go*
84-
for BINARY in "${DIR}"/*
85-
do
86-
echo "mv ./${BINARY} ./"
87-
mv ./${BINARY} ./
88-
done
89-
rm -r "${DIR}"
90-
fi
91-
done
78+
DIR="${GOOS}_${GOARCH}"
79+
if [ -d "${DIR}" ]; then
80+
echo "Found ${DIR} copying binaries"
81+
rm ./go*
82+
for BINARY in "${DIR}"/*
83+
do
84+
echo "mv ./${BINARY} ./"
85+
mv ./${BINARY} ./
86+
done
87+
rm -r ./"${DIR}"
88+
rm -r ../pkg/tool/linux_amd64/
89+
fi
9290
cd ..
9391
ls -al ./bin
9492

‎.github/workflows/test-go1_23_src.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ name: Builder test Go 1.23
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: '15 0 1-20 * 2,4,6'
7-
- cron: '15 0 21-31 * 6'
6+
- cron: '15 0 * * 4,6'
87
push:
98
branches:
109
- build

‎.github/workflows/test-go1_24.yml‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ name: Build patched Go 1.24 for tests
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: '20 0 1-20 * 2,4,6'
7-
- cron: '20 0 21-31 * 6'
6+
- cron: '20 0 * * 4,6'
87
push:
98
branches:
109
- build
@@ -73,23 +72,22 @@ jobs:
7372
cd ..
7473
7574
- name: Copy binaries into bin
75+
if: matrix.goos != 'linux' || matrix.goarch != 'amd64'
7676
shell: bash
7777
run: |
7878
cd ./bin
79-
DIRS=(windows_amd64 windows_386)
80-
for DIR in "${DIRS[@]}"
81-
do
82-
if [ -d "${DIR}" ]; then
83-
echo "Found ${DIR} copying binaries"
84-
rm go*
85-
for BINARY in "${DIR}"/*
86-
do
87-
echo "mv ./${BINARY} ./"
88-
mv ./${BINARY} ./
89-
done
90-
rm -r "${DIR}"
91-
fi
92-
done
79+
DIR="${GOOS}_${GOARCH}"
80+
if [ -d "${DIR}" ]; then
81+
echo "Found ${DIR} copying binaries"
82+
rm ./go*
83+
for BINARY in "${DIR}"/*
84+
do
85+
echo "mv ./${BINARY} ./"
86+
mv ./${BINARY} ./
87+
done
88+
rm -r ./"${DIR}"
89+
rm -r ../pkg/tool/linux_amd64/
90+
fi
9391
cd ..
9492
ls -al ./bin
9593

‎.github/workflows/test-go1_24_src.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ name: Builder test Go 1.24
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: '25 0 1-20 * 2,4,6'
7-
- cron: '25 0 21-31 * 6'
6+
- cron: '25 0 * * 4,6'
87
push:
98
branches:
109
- build

0 commit comments

Comments
 (0)