Skip to content

Commit 7286fc8

Browse files
authored
⬆️ Bump dependencies, upgrade build system (#398)
1 parent 32f71ac commit 7286fc8

File tree

5 files changed

+184
-340
lines changed

5 files changed

+184
-340
lines changed

.github/workflows/release.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,23 @@ on:
44
branches:
55
- main
66
paths-ignore:
7-
- '**.md'
8-
- '**.spec.js'
9-
- '.idea'
10-
- '.gitignore'
11-
- '.github/**'
12-
- '!.github/workflows/release.yml'
7+
- "**.md"
8+
- "**.spec.js"
9+
- ".idea"
10+
- ".gitignore"
11+
- ".github/**"
12+
- "!.github/workflows/release.yml"
1313
pull_request:
1414
branches:
1515
- main
1616

17-
1817
concurrency:
1918
group: release-${{ github.ref }}
2019
cancel-in-progress: true
2120

22-
2321
defaults:
2422
run:
25-
shell: 'bash'
26-
23+
shell: "bash"
2724

2825
jobs:
2926
pre_job:
@@ -65,11 +62,11 @@ jobs:
6562

6663
upload_artifacts:
6764
name: Build
68-
needs: [ get_metadata, pre_job ]
65+
needs: [get_metadata, pre_job]
6966

7067
strategy:
7168
matrix:
72-
os: [ macos-10.15, ubuntu-latest, windows-latest ]
69+
os: [macos-10.15, ubuntu-latest, windows-latest]
7370

7471
runs-on: ${{ matrix.os }}
7572

@@ -106,7 +103,7 @@ jobs:
106103
toolchain: stable
107104

108105
- name: Install pyoxidizer fork
109-
run: cargo install --git https://github.com/audapolis/PyOxidizer.git --rev 3f3980d81e67928db83df20b9c1aefa3c8235866 pyoxidizer
106+
run: cargo install pyoxidizer
110107

111108
- name: Install Poetry
112109
uses: snok/install-poetry@v1
@@ -119,7 +116,7 @@ jobs:
119116
- uses: actions/setup-node@v2
120117
with:
121118
node-version: 16
122-
cache: 'npm'
119+
cache: "npm"
123120
cache-dependency-path: app/package-lock.json
124121

125122
- name: Install dependencies
@@ -171,7 +168,7 @@ jobs:
171168
mac_certs_password: ${{ secrets.mac_certs_password }}
172169

173170
finalize:
174-
needs: [ upload_artifacts ]
171+
needs: [upload_artifacts]
175172
if: always()
176173
# && ${{ needs.upload_artifacts.result == 'skipped' || needs.upload_artifacts.result == 'success' }}
177174

server/build_server.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ rm -rf app/server
1414
mkdir -p app/server
1515
cd server
1616
poetry export -f requirements.txt --without-hashes -o requirements.txt
17+
# tldr; fun fun fun, see https://github.com/pypa/setuptools/issues/3089
18+
# Longer explanation: setuptools >= 60 ships an own version of distutils, which
19+
# isn't properly loaded in our server build, crashing the server. This fixes it
20+
# for now, we might need a different fix in the future
21+
echo 'setuptools<60.0.0' >> requirements.txt
1722
pyoxidizer build --release
1823
cp -r build/*/release/install/* ../app/server/
19-
cp licenses.md ../app/server/licenses.md

0 commit comments

Comments
 (0)