Skip to content

Commit 3e4914e

Browse files
committed
Fix Github Windows build
1 parent f22f9d7 commit 3e4914e

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
paths:
66
- 'src/**'
7+
workflow_dispatch:
78

89
env:
910
PYTHON_URL: https://www.python.org/ftp/python/3.8.10/python-3.8.10.exe
@@ -16,20 +17,20 @@ jobs:
1617
name: Build Python pyz file
1718
runs-on: ubuntu-20.04
1819
steps:
19-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2021

2122
- name: Declare short commit variable
2223
id: vars
2324
run: |
24-
echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
25+
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
2526
2627
- name: Build pyz file
2728
run: |
2829
./build.sh
2930
mv torparse.pyz tor-relay-scanner-${{ steps.vars.outputs.sha_short }}.pyz
3031
3132
- name: Upload output file x86
32-
uses: actions/upload-artifact@v2
33+
uses: actions/upload-artifact@v3
3334
with:
3435
name: tor-relay-scanner-${{ steps.vars.outputs.sha_short }}.pyz
3536
path: tor-relay-scanner-${{ steps.vars.outputs.sha_short }}.pyz
@@ -38,25 +39,27 @@ jobs:
3839
name: Build Windows exe file
3940
runs-on: ubuntu-20.04
4041
steps:
41-
- uses: actions/checkout@v2
42+
- uses: actions/checkout@v3
4243

4344
- name: Declare short commit variable
4445
id: vars
4546
run: |
46-
echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
47+
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
4748
4849
- name: Install Wine
4950
run: >
5051
sudo rm /var/lib/man-db/auto-update &&
5152
sudo sed -i 's/yes/no/g' /etc/initramfs-tools/update-initramfs.conf &&
53+
sudo apt-add-repository -y ppa:ondrej/php &&
54+
sudo eatmydata apt install ppa-purge &&
55+
sudo eatmydata ppa-purge -y ppa:ondrej/php &&
5256
sudo dpkg --add-architecture i386 && sudo apt update &&
53-
sudo eatmydata apt install -y --allow-downgrades libpcre2-8-0/focal &&
5457
sudo DEBIAN_FRONTEND=noninteractive eatmydata
5558
apt install -y --no-install-recommends wine-stable wine32 xvfb
5659
5760
- name: Download Python from cache
5861
id: python-cache
59-
uses: actions/cache@v2
62+
uses: actions/cache@v3
6063
with:
6164
path: ${{ env. PYTHON_NAME }}
6265
key: ${{ env. PYTHON_SHA256 }}
@@ -79,7 +82,7 @@ jobs:
7982
mv dist/__main__.exe tor-relay-scanner-${{ steps.vars.outputs.sha_short }}.exe
8083
8184
- name: Upload output file
82-
uses: actions/upload-artifact@v2
85+
uses: actions/upload-artifact@v3
8386
with:
8487
name: tor-relay-scanner-${{ steps.vars.outputs.sha_short }}.exe
8588
path: tor-relay-scanner-${{ steps.vars.outputs.sha_short }}.exe

0 commit comments

Comments
 (0)