Skip to content
Snippets Groups Projects
Commit 925b1a88 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Re-enable Darwin

Also, allow tests to run as soon as jsdoor is done, and don't use
the artifact file, use the local copy instead.
parent ffcd15ba
No related branches found
No related tags found
No related merge requests found
Pipeline #6228 passed
......@@ -672,9 +672,11 @@ spec:
extends:
- .$[[ inputs.os ]]-test
script:
- tar -xzf "/tmp/gitlab-runner/$[[ inputs.os ]]-$[[ inputs.platform ]]-${CI_PIPELINE_ID}/jsdoor.tgz"
- "src/sbbs3/*.exe.release/jsdoor exec/tests/test.js"
dependencies:
- "$[[ inputs.os ]]-$[[ inputs.platform ]] [jsdoor]"
needs:
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [jsdoor]"
artifacts: false
rules:
- if: '"$[[ inputs.cross_platform ]]" == "yes"'
when: never
......
......@@ -67,13 +67,13 @@ include:
build_flags: 'AR=/home/admin/mingw-w64/bin/x86_64-w64-mingw32-ar AS=/home/admin/mingw-w64/bin/x86_64-w64-mingw32-as CC="ccache /home/admin/mingw-w64/bin/x86_64-w64-mingw32-gcc" CXX="ccache /home/admin/mingw-w64/bin/x86_64-w64-mingw32-g++" RANLIB=/home/admin/mingw-w64/bin/x86_64-w64-mingw32-ranlib WINDRES=/home/admin/mingw-w64/bin/x86_64-w64-mingw32-windres RELEASE=1'
no_javascript: 'yes'
has_curses: 'no'
# - local: '.gitlab-ci-unix.yml'
# inputs:
# os: 'darwin'
# platform: 'x86'
# tagname: 'macOS'
# gnu_make: 'make'
# build_flags: 'CC="ccache cc" CXX="ccache c++" RELEASE=1'
- local: '.gitlab-ci-unix.yml'
inputs:
os: 'darwin'
platform: 'x86'
tagname: 'macOS'
gnu_make: 'make'
build_flags: 'CC="ccache cc" CXX="ccache c++" RELEASE=1'
smoketest-jsexec-linux:
tags: [Linux]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment