Skip to content

Commit

Permalink
Merge branch 'main' into wine-b-gone
Browse files Browse the repository at this point in the history
  • Loading branch information
ethteck committed Sep 24, 2022
2 parents 7fad886 + 00cf81c commit 931c328
Show file tree
Hide file tree
Showing 159 changed files with 6,139 additions and 3,036 deletions.
17 changes: 15 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
sudo apt-get install \
binutils-aarch64-linux-gnu \
binutils-mips-linux-gnu \
binutils-powerpc-linux-gnu \
dos2unix \
Expand Down Expand Up @@ -92,7 +93,7 @@ jobs:
run: cd backend && poetry run python3 ./manage.py runserver > /dev/null 2>&1 &

- name: Install frontend dependencies
run: cd frontend && yarn
run: cd frontend && yarn --frozen-lockfile

- name: Build frontend
run: cd frontend && yarn build
Expand Down Expand Up @@ -142,6 +143,8 @@ jobs:
-e COMPILER_BASE_PATH=/compilers \
-e WINEPREFIX=/tmp/wine \
-e LOCAL_FILE_DIR=/local_files \
-e USE_SANDBOX_JAIL=on \
-e SANDBOX_DISABLE_PROC=true \
decompme_backend -c 'cd /decomp.me/backend && \
poetry install && \
poetry run python manage.py test'
Expand All @@ -152,10 +155,20 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: reviewdog/action-setup@v1
- run: cd frontend && yarn
- run: cd frontend && yarn --frozen-lockfile
- run: reviewdog -reporter=github-check
env:
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
frontend_lint:
name: eslint & stylelint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 14
- run: cd frontend && yarn --frozen-lockfile
- run: cd frontend && yarn lint
mypy:
name: mypy
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ build
local_files/
backend/local_files/
backend/virtualenvs/
backend/docker.dev.env
postgres/
sandbox/
*.db
Expand Down
1 change: 1 addition & 0 deletions backend/asm_differ/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.mypy_cache/
__pycache__/
.vscode/
4 changes: 2 additions & 2 deletions backend/asm_differ/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/simonlindholm/asm-differ
branch = main
commit = 291173ed30e8a6dc91c28334aa1275a555d725b1
parent = 652de2580be2e74466c0b4fe192ebf8742e83d65
commit = 516595687dd8d9b3dd409f263269a973c38b96ea
parent = b026a2ef101e56137870e0ee91e527475f55db62
method = merge
cmdver = 0.4.3
Loading

0 comments on commit 931c328

Please sign in to comment.