@@ -196,30 +196,21 @@ jobs:
196196 curl https://github.com/golang/go/commit/9e43850a3298a9b8b1162ba0033d4c53f8637571.diff | patch --verbose -R -p 1
197197
198198 - name : Set variables
199- if : ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version != '' }}
200- run : echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
201- shell : bash
202-
203- - name : Set variables
204- if : ${{ github.event_name == 'pull_request' || (github.event_name != 'workflow_dispatch' && github.ref_name == 'Alpha') }}
205- run : echo "VERSION=alpha-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
206- shell : bash
207-
208- - name : Set Time Variable
209199 run : |
200+ VERSION="${GITHUB_REF_NAME,,}-$(git rev-parse --short HEAD)"
201+ PackageVersion="$(curl -s "https://api.github.com/repos/MetaCubeX/mihomo/releases/latest" | jq -r '.tag_name' | sed 's/v//g' | awk -F '.' '{$NF = $NF + 1; print}' OFS='.').${VERSION/-/.}"
202+ if [ -n "${{ github.event.inputs.version }}" ]; then
203+ VERSION=${{ github.event.inputs.version }}
204+ PackageVersion="${VERSION#v}" >> $GITHUB_ENV
205+ fi
206+ echo "VERSION=${VERSION}" >> $GITHUB_ENV
207+ echo "PackageVersion=${PackageVersion}" >> $GITHUB_ENV
208+
210209 echo "BUILDTIME=$(date)" >> $GITHUB_ENV
211210 echo "CGO_ENABLED=0" >> $GITHUB_ENV
212211 echo "BUILDTAG=-extldflags --static" >> $GITHUB_ENV
213212 echo "GOTOOLCHAIN=local" >> $GITHUB_ENV
214213
215- - name : Set PackageVersion
216- run : |
217- PackageVersion=$(curl -s "https://api.github.com/repos/MetaCubeX/mihomo/releases/latest" | grep -o '"tag_name": "[^"]*' | grep -o '[^"]*$' | sed 's/v//g' )
218- if [ $(git branch | awk -F ' ' '{print $2}') = "Alpha" ]; then
219- PackageVersion="$(echo "${PackageVersion}" | awk -F '.' '{$NF = $NF + 1; print}' OFS='.').${VERSION/-/.}"
220- fi
221- echo "PackageVersion=${PackageVersion}" >> $GITHUB_ENV
222-
223214 - name : Setup NDK
224215 if : ${{ matrix.jobs.goos == 'android' }}
225216 uses : nttld/setup-ndk@v1
@@ -243,7 +234,7 @@ jobs:
243234
244235 - name : Update CA
245236 run : |
246- sudo apt-get install ca-certificates
237+ sudo apt-get update && sudo apt-get install ca-certificates
247238 sudo update-ca-certificates
248239 cp -f /etc/ssl/certs/ca-certificates.crt component/ca/ca-certificates.crt
249240
@@ -298,7 +289,7 @@ jobs:
298289 run : |
299290 set -xeuo pipefail
300291 sudo gem install fpm
301- sudo apt-get install -y libarchive-tools
292+ sudo apt-get update && sudo apt-get install -y libarchive-tools
302293 cp .github/release/.fpm_systemd .fpm
303294
304295 fpm -t pacman \
0 commit comments