Remove useless nodejs in build bin

Fix get name

Fix get name

Fix mv file

Fix build packages

Fix build linux packages

Fix build linux packages 2

Fix build linux packages 3

Fix build linux packages 4

Fix build linux packages 5

Update release_feat_v5.yml

Fix build linux packages 7
This commit is contained in:
Markson committed 2023-08-14 11:17:40 +08:00
1 parent a20e4ea12e
commit ef8ff1648f
2 files changed
+41 -45

No files matched your search

+22 -26
View File
@@ -130,8 +130,8 @@ jobs:
id: get_filename
run: |
$build_name = $(((Get-Content ./install/friendly-filenames.json | ConvertFrom-Json)."${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.goarm }}").friendlyName)
echo "BUILD_NAME=$build_name" >> $GITHUB_OUTPUT
echo "BUILD_NAME=$build_name" >> $GITHUB_ENV
Write-Output "BUILD_NAME=$build_name" >> ${env:GITHUB_OUTPUT}
Write-Output "BUILD_NAME=$build_name" >> ${env:GITHUB_ENV}
- name: Check Version
id: prep
@@ -156,13 +156,6 @@ jobs:
with:
go-version: ^1.21
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: lts/*
cache: 'yarn'
cache-dependency-path: gui/yarn.lock
- name: Install Dependencies
run: |
sudo apt-get update -y && sudo apt-get install -y gzip
@@ -176,9 +169,9 @@ jobs:
fi
done
cd service
go build -ldflags="-X github.com/v2rayA/v2rayA/conf.Version=$VERSION -s -w" -o ../v2raya_"$GOOS"_"$GOARCH""$GOARM"_"$VERSION""$WIN_SUF"
go build -ldflags="-X github.com/v2rayA/v2rayA/conf.Version=$VERSION -s -w" -o ../build_"$GOOS"_"$GOARCH""$GOARM"_"$VERSION""$WIN_SUF"
cd ..
mv v2raya_"$GOOS"_"$GOARCH""$GOARM"_"$VERSION""$WIN_SUF" v2raya_"${{ steps.get_filename.outputs.BUILD_NAME }}"_"$VERSION""$WIN_SUF"
mv build_"$GOOS"_"$GOARCH""$GOARM"_"$VERSION""$WIN_SUF" v2raya_"${{ steps.get_filename.outputs.BUILD_NAME }}"_"$VERSION""$WIN_SUF"
- name: Upload Artifact
uses: nanoufo/action-upload-artifacts-and-release-assets@v1.5
@@ -243,7 +236,7 @@ jobs:
Copy-Item D:\Downloads\v2raya_windows_arm64_${{ steps.prep.outputs.VERSION }}.exe D:\v2raya-arm64-windows\bin\v2raya.exe
Copy-Item D:\Downloads\v2raya_windows_x64_${{ steps.prep.outputs.VERSION }}.exe D:\v2raya-x86_64-windows\bin\v2raya.exe
pwsh -c ./install/windows-inno/build-helper.ps1
mv D:\installer_windows_inno_x64.exe installer_windows_inno_amd64_${{ steps.prep.outputs.VERSION }}.exe
mv D:\installer_windows_inno_x64.exe installer_windows_inno_x64_${{ steps.prep.outputs.VERSION }}.exe
mv D:\installer_windows_inno_arm64.exe installer_windows_inno_arm64_${{ steps.prep.outputs.VERSION }}.exe
- name: Upload Artifact
@@ -288,8 +281,11 @@ jobs:
id: get_filename
run: |
$build_name = $(((Get-Content ./install/friendly-filenames.json | ConvertFrom-Json)."${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.goarm }}").friendlyName)
echo "BUILD_NAME=$build_name" >> $GITHUB_OUTPUT
echo "BUILD_NAME=$build_name" >> $GITHUB_ENV
$friendly_arch = $((((Get-Content ./install/friendly-filenames.json | ConvertFrom-Json)."${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.goarm }}").friendlyName).Split('_')[1])
Write-Output "BUILD_NAME=$build_name" >> ${env:GITHUB_OUTPUT}
Write-Output "BUILD_NAME=$build_name" >> ${env:GITHUB_ENV}
Write-Output "FRIENDLY_ARCH=$friendly_arch" >> ${env:GITHUB_OUTPUT}
Write-Output "FRIENDLY_ARCH=$friendly_arch" >> ${env:GITHUB_ENV}
- name: Check Version
id: prep
@@ -329,13 +325,13 @@ jobs:
run: |
ls -l build/
- name: Build packages
- name: Build Packages
run: |
sudo gem install fpm -v 1.15.1
sudo apt-get install -y libarchive-tools rpm tar unzip
sudo chmod 755 ./test/v2raya_linux_amd64_$VERSION
./test/v2raya_linux_amd64_$VERSION --report config | sed '1,6d' | fold -s -w 78 | sed -E 's/^([^#].+)/# \1/' >> install/universal/v2raya.default
sudo chmod 755 ./build/v2raya_${{ matrix.goos }}_${{ matrix.goarch }}${{ matrix.goarm }}_${{ steps.prep.outputs.VERSION }}
sudo chmod 755 ./test/v2raya_linux_x64_$VERSION
./test/v2raya_linux_x64_$VERSION --report config | sed '1,6d' | fold -s -w 78 | sed -E 's/^([^#].+)/# \1/' >> install/universal/v2raya.default
sudo chmod 755 ./build/v2raya_${{ steps.get_filename.outputs.BUILD_NAME }}_${{ steps.prep.outputs.VERSION }}
for package_manager in deb rpm pacman; do
if [ "$package_manager" == 'pacman' ];then
if [ "$GOARCH" == 'arm' ] && [ "$GOARM" == '7' ];then
@@ -366,24 +362,24 @@ jobs:
--package installer_linux_$GOARCH$GOAMD64$GOARM_${{ steps.prep.outputs.VERSION }}.$package_manager \
--after-install ./install/universal/after_install.sh \
--after-upgrade ./install/universal/after_upgrade.sh \
./build/v2raya_${{ matrix.goos }}_${{ matrix.goarch }}${{ matrix.goarm }}_${{ steps.prep.outputs.VERSION }}=/usr/bin/v2raya \
./build/v2raya_${{ steps.get_filename.outputs.BUILD_NAME }}_${{ steps.prep.outputs.VERSION }}=/usr/bin/v2raya \
./install/universal/v2raya.service=/usr/lib/systemd/system/v2raya.service \
./install/universal/v2raya-lite.service=/usr/lib/systemd/user/v2raya-lite.service \
./install/universal/v2raya.png=/usr/share/icons/hicolor/512x512/apps/v2raya.png \
./install/universal/v2raya.desktop=/usr/share/applications/v2raya.desktop \
./install/universal/v2raya.default=/etc/default/v2raya
done
mv installer_linux_$GOARCH$GOAMD64$GOARM_${{ steps.prep.outputs.VERSION }}.pacman installer_archlinux_$${{ steps.get_filename.outputs.BUILD_NAME }}_${{ steps.prep.outputs.VERSION }}.pkg.tar.zst
mv installer_linux_$GOARCH$GOAMD64$GOARM_${{ steps.prep.outputs.VERSION }}.rpm installer_redhat_${{ steps.get_filename.outputs.BUILD_NAME }}_${{ steps.prep.outputs.VERSION }}.rpm
mv installer_linux_$GOARCH$GOAMD64$GOARM_${{ steps.prep.outputs.VERSION }}.deb installer_debian_${{ steps.get_filename.outputs.BUILD_NAME }}_${{ steps.prep.outputs.VERSION }}.deb
mv installer_linux_$GOARCH$GOAMD64$GOARM_${{ steps.prep.outputs.VERSION }}.pacman installer_archlinux_${{ steps.get_filename.outputs.FRIENDLY_ARCH }}_${{ steps.prep.outputs.VERSION }}.pkg.tar.zst
mv installer_linux_$GOARCH$GOAMD64$GOARM_${{ steps.prep.outputs.VERSION }}.rpm installer_redhat_${{ steps.get_filename.outputs.FRIENDLY_ARCH }}_${{ steps.prep.outputs.VERSION }}.rpm
mv installer_linux_$GOARCH$GOAMD64$GOARM_${{ steps.prep.outputs.VERSION }}.deb installer_debian_${{ steps.get_filename.outputs.FRIENDLY_ARCH }}_${{ steps.prep.outputs.VERSION }}.deb
- name: Upload Artifact
uses: nanoufo/action-upload-artifacts-and-release-assets@v1.5
with:
path: |
installer_archlinux_${{ steps.get_filename.outputs.BUILD_NAME }}_${{ steps.prep.outputs.VERSION }}.pkg.tar.zst
installer_redhat_${{ steps.get_filename.outputs.BUILD_NAME }}_${{ steps.prep.outputs.VERSION }}.rpm
installer_debian_${{ steps.get_filename.outputs.BUILD_NAME }}_${{ steps.prep.outputs.VERSION }}.deb
installer_archlinux_${{ steps.get_filename.outputs.FRIENDLY_ARCH }}_${{ steps.prep.outputs.VERSION }}.pkg.tar.zst
installer_redhat_${{ steps.get_filename.outputs.FRIENDLY_ARCH }}_${{ steps.prep.outputs.VERSION }}.rpm
installer_debian_${{ steps.get_filename.outputs.FRIENDLY_ARCH }}_${{ steps.prep.outputs.VERSION }}.deb
GitHub_Release:
@@ -626,4 +622,4 @@ jobs:
gh release create $tag_version --repo v2rayA/homebrew-v2raya --title "Releases $version" --generate-notes
gh upload v2rayA/homebrew-v2raya --clobber --repo v2rayA/homebrew-v2raya v2raya-x86_64-linux.zip v2raya-x86_64-linux.zip.sha256.txt
gh upload v2rayA/homebrew-v2raya --clobber --repo v2rayA/homebrew-v2raya v2raya-x86_64-macos.zip v2raya-x86_64-macos.zip.sha256.txt
gh upload v2rayA/homebrew-v2raya --clobber --repo v2rayA/homebrew-v2raya v2raya-aarch64-macos.zip v2raya-aarch64-macos.zip.sha256.txt
gh upload v2rayA/homebrew-v2raya --clobber --repo v2rayA/homebrew-v2raya v2raya-aarch64-macos.zip v2raya-aarch64-macos.zip.sha256.txt
+19 -19
View File
@@ -1,59 +1,59 @@
{
"linux-386": {
"friendlyName": "linux-x86"
"friendlyName": "linux_x86"
},
"linux-amd64": {
"friendlyName": "linux-x64"
"friendlyName": "linux_x64"
},
"linux-arm5": {
"friendlyName": "linux-armv5"
"friendlyName": "linux_armv5"
},
"linux-arm6": {
"friendlyName": "linux-armv6"
"friendlyName": "linux_armv6"
},
"linux-arm7": {
"friendlyName": "linux-armv7"
"friendlyName": "linux_armv7"
},
"linux-arm64": {
"friendlyName": "linux-arm64"
"friendlyName": "linux_arm64"
},
"linux-mips64le": {
"friendlyName": "linux-mips64le"
"friendlyName": "linux_mips64le"
},
"linux-mips64": {
"friendlyName": "linux-mips64"
"friendlyName": "linux_mips64"
},
"linux-mipsle": {
"friendlyName": "linux-mips32le"
"friendlyName": "linux_mips32le"
},
"linux-mips": {
"friendlyName": "linux-mips32"
"friendlyName": "linux_mips32"
},
"linux-riscv64": {
"friendlyName": "linux-riscv64"
"friendlyName": "linux_riscv64"
},
"windows-amd64": {
"friendlyName": "windows-x64"
"friendlyName": "windows_x64"
},
"windows-arm64": {
"friendlyName": "windows-arm64"
"friendlyName": "windows_arm64"
},
"freebsd-amd64": {
"friendlyName": "freebsd-x64"
"friendlyName": "freebsd_x64"
},
"freebsd-arm64": {
"friendlyName": "freebsd-arm64"
"friendlyName": "freebsd_arm64"
},
"openbsd-amd64": {
"friendlyName": "openbsd-x64"
"friendlyName": "openbsd_x64"
},
"openbsd-arm64": {
"friendlyName": "openbsd-arm64"
"friendlyName": "openbsd_arm64"
},
"darwin-amd64": {
"friendlyName": "darwin-x64"
"friendlyName": "darwin_x64"
},
"darwin-arm64": {
"friendlyName": "darwin-arm64"
"friendlyName": "darwin_arm64"
}
}