Fix #19055 - w32/w64 windows artifacts filenames ##ci

This commit is contained in:
pancake 2021-09-16 09:15:30 -07:00 committed by GitHub
parent 8978c80d21
commit 4c4f26095b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -155,7 +155,7 @@ jobs:
find "/tmp/r 2"
LD_LIBRARY_PATH="/tmp/r 2/lib/x86_64-linux-gnu/" "/tmp/r 2/bin/r2" -v
w32-meson:
if: contains(github.ref, 'master') || contains(github.ref, 'ci-')
# if: contains(github.ref, 'master') || contains(github.ref, 'ci-')
runs-on: windows-latest
steps:
- name: Checkout
@ -165,22 +165,22 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install meson ninja r2pipe wget
- name: Extract r2 version
run: echo "##[set-output name=branch;]$( cd sys;python version.py )"
id: r2v
- name: Build with meson + ninja
shell: pwsh
run: |
.github\vsdevenv.ps1
meson -Db_vscrt=mt --buildtype=release --prefix=$PWD\radare2-install build
meson -Db_vscrt=mt --buildtype=release --prefix=$PWD\radare2-${{ steps.r2v.outputs.branch }}-w32 build
ninja -C build
ninja -C build install
- name: Extract r2 version
run: echo "##[set-output name=branch;]$( cd sys;python version.py )"
id: r2v
- name: Create zip artifact
run: 7z a radare2-git.zip $PWD\radare2-install
run: 7z a radare2-${{ steps.r2v.outputs.branch }}-w32.zip $PWD\radare2-${{ steps.r2v.outputs.branch }}-w32
- uses: actions/upload-artifact@v2
with:
name: radare2-${{ steps.r2v.outputs.branch }}-w32.zip
path: .\radare2-git.zip
path: radare2-${{ steps.r2v.outputs.branch }}-w32.zip
# - uses: actions/checkout@v2
# with:
# repository: radareorg/radare2-win-installer
@ -209,27 +209,24 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install meson ninja r2pipe wget
- name: Extract r2 version
run: echo "##[set-output name=branch;]$( cd sys; python version.py )"
id: r2v
- name: Build with meson + ninja
shell: pwsh
run: |
# cmd '/c call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" "x86_64"'
bash sys/source_bat.bash 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat' "x86_64"
# meson_options: --default-library=shared|static -Dstatic_runtime=true --backend vs2019
meson --buildtype=release --prefix=$PWD\radare2-install build
meson --buildtype=release --prefix=$PWD\radare2-${{ steps.r2v.outputs.branch }}-w64 build
ninja -C build
ninja -C build install
- name: Extract r2 version
run: echo "##[set-output name=branch;]$( cd sys; python version.py )"
id: r2v
- name: Create zip artifact
run: |
$env:R2V="${{ steps.r2v.outputs.branch }}"
mv radare2-install "radare2-${env:R2V}"
7z a radare2-${env:R2V}-w64.zip $PWD\radare2-${env:R2V}
run: 7z a radare2-${{ steps.r2v.outputs.branch }}-w64.zip $PWD\radare2-${{ steps.r2v.outputs.branch }}-w64
- uses: actions/upload-artifact@v2
with:
name: radare2-${{ steps.r2v.outputs.branch }}-w64.zip
path: .\radare2-*.zip
path: radare2-${{ steps.r2v.outputs.branch }}-w64.zip
# - uses: actions/checkout@v2
# with:
# repository: radareorg/radare2-win-installer