Skip to content

Commit 931c328

Browse files
committed
Merge branch 'main' into wine-b-gone
2 parents 7fad886 + 00cf81c commit 931c328

File tree

159 files changed

+6139
-3036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+6139
-3036
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
3939
4040
sudo apt-get install \
41+
binutils-aarch64-linux-gnu \
4142
binutils-mips-linux-gnu \
4243
binutils-powerpc-linux-gnu \
4344
dos2unix \
@@ -92,7 +93,7 @@ jobs:
9293
run: cd backend && poetry run python3 ./manage.py runserver > /dev/null 2>&1 &
9394

9495
- name: Install frontend dependencies
95-
run: cd frontend && yarn
96+
run: cd frontend && yarn --frozen-lockfile
9697

9798
- name: Build frontend
9899
run: cd frontend && yarn build
@@ -142,6 +143,8 @@ jobs:
142143
-e COMPILER_BASE_PATH=/compilers \
143144
-e WINEPREFIX=/tmp/wine \
144145
-e LOCAL_FILE_DIR=/local_files \
146+
-e USE_SANDBOX_JAIL=on \
147+
-e SANDBOX_DISABLE_PROC=true \
145148
decompme_backend -c 'cd /decomp.me/backend && \
146149
poetry install && \
147150
poetry run python manage.py test'
@@ -152,10 +155,20 @@ jobs:
152155
steps:
153156
- uses: actions/checkout@v2
154157
- uses: reviewdog/action-setup@v1
155-
- run: cd frontend && yarn
158+
- run: cd frontend && yarn --frozen-lockfile
156159
- run: reviewdog -reporter=github-check
157160
env:
158161
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
162+
frontend_lint:
163+
name: eslint & stylelint
164+
runs-on: ubuntu-latest
165+
steps:
166+
- uses: actions/checkout@v2
167+
- uses: actions/setup-node@v1
168+
with:
169+
node-version: 14
170+
- run: cd frontend && yarn --frozen-lockfile
171+
- run: cd frontend && yarn lint
159172
mypy:
160173
name: mypy
161174
runs-on: ubuntu-latest

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ build
66
local_files/
77
backend/local_files/
88
backend/virtualenvs/
9+
backend/docker.dev.env
910
postgres/
1011
sandbox/
1112
*.db

backend/asm_differ/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.mypy_cache/
22
__pycache__/
3+
.vscode/

backend/asm_differ/.gitrepo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = https://github.com/simonlindholm/asm-differ
88
branch = main
9-
commit = 291173ed30e8a6dc91c28334aa1275a555d725b1
10-
parent = 652de2580be2e74466c0b4fe192ebf8742e83d65
9+
commit = 516595687dd8d9b3dd409f263269a973c38b96ea
10+
parent = b026a2ef101e56137870e0ee91e527475f55db62
1111
method = merge
1212
cmdver = 0.4.3

0 commit comments

Comments
 (0)