Skip to content

Commit

Permalink
⬆️ Bump dependencies, upgrade build system (#398)
Browse files Browse the repository at this point in the history
  • Loading branch information
pajowu authored Sep 28, 2022
1 parent 32f71ac commit 7286fc8
Show file tree
Hide file tree
Showing 5 changed files with 184 additions and 340 deletions.
27 changes: 12 additions & 15 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,23 @@ on:
branches:
- main
paths-ignore:
- '**.md'
- '**.spec.js'
- '.idea'
- '.gitignore'
- '.github/**'
- '!.github/workflows/release.yml'
- "**.md"
- "**.spec.js"
- ".idea"
- ".gitignore"
- ".github/**"
- "!.github/workflows/release.yml"
pull_request:
branches:
- main


concurrency:
group: release-${{ github.ref }}
cancel-in-progress: true


defaults:
run:
shell: 'bash'

shell: "bash"

jobs:
pre_job:
Expand Down Expand Up @@ -65,11 +62,11 @@ jobs:

upload_artifacts:
name: Build
needs: [ get_metadata, pre_job ]
needs: [get_metadata, pre_job]

strategy:
matrix:
os: [ macos-10.15, ubuntu-latest, windows-latest ]
os: [macos-10.15, ubuntu-latest, windows-latest]

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

Expand Down Expand Up @@ -106,7 +103,7 @@ jobs:
toolchain: stable

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

- name: Install Poetry
uses: snok/install-poetry@v1
Expand All @@ -119,7 +116,7 @@ jobs:
- uses: actions/setup-node@v2
with:
node-version: 16
cache: 'npm'
cache: "npm"
cache-dependency-path: app/package-lock.json

- name: Install dependencies
Expand Down Expand Up @@ -171,7 +168,7 @@ jobs:
mac_certs_password: ${{ secrets.mac_certs_password }}

finalize:
needs: [ upload_artifacts ]
needs: [upload_artifacts]
if: always()
# && ${{ needs.upload_artifacts.result == 'skipped' || needs.upload_artifacts.result == 'success' }}

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

0 comments on commit 7286fc8

Please sign in to comment.