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

Some more pipeline fixins.

parent 3bcdce83
No related branches found
No related tags found
No related merge requests found
Pipeline #5581 failed
...@@ -9,6 +9,8 @@ spec: ...@@ -9,6 +9,8 @@ spec:
default: 'RELEASE=1' default: 'RELEASE=1'
no_javascript: no_javascript:
default: 'no' default: 'no'
has_curses:
default: 'yes'
--- ---
".$[[ inputs.os ]]": ".$[[ inputs.os ]]":
...@@ -22,6 +24,7 @@ spec: ...@@ -22,6 +24,7 @@ spec:
OSP: "$[[ inputs.os ]]-$[[ inputs.platform ]]" OSP: "$[[ inputs.os ]]-$[[ inputs.platform ]]"
BUILD_FLAGS: "$[[ inputs.build_flags ]]" BUILD_FLAGS: "$[[ inputs.build_flags ]]"
NO_JAVASCRIPT: "$[[ inputs.no_javascript ]]" NO_JAVASCRIPT: "$[[ inputs.no_javascript ]]"
HAS_CURSES: "$[[ inputs.has_curses ]]"
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
".$[[ inputs.os ]]-build": ".$[[ inputs.os ]]-build":
...@@ -174,6 +177,8 @@ spec: ...@@ -174,6 +177,8 @@ spec:
- "src/sbbs3/*.exe.release/*" - "src/sbbs3/*.exe.release/*"
needs: needs:
- job: "ciolib-$[[ inputs.os ]]" - job: "ciolib-$[[ inputs.os ]]"
- job: "encode-$[[ inputs.os ]]"
- job: "hash-$[[ inputs.os ]]"
- job: "smblib-$[[ inputs.os ]]" - job: "smblib-$[[ inputs.os ]]"
- job: "uifc-$[[ inputs.os ]]" - job: "uifc-$[[ inputs.os ]]"
- job: "xpdev-$[[ inputs.os ]]" - job: "xpdev-$[[ inputs.os ]]"
...@@ -217,6 +222,15 @@ spec: ...@@ -217,6 +222,15 @@ spec:
- job: "uifc-$[[ inputs.os ]]" - job: "uifc-$[[ inputs.os ]]"
- job: "xpdev-$[[ inputs.os ]]" - job: "xpdev-$[[ inputs.os ]]"
- job: "gitinfo-$[[ inputs.os ]]" - job: "gitinfo-$[[ inputs.os ]]"
rules:
- if: $HAS_CURSES == "no"
when: never
- changes:
- src/**/*
- 3rdp/**/*
- ctrl/text.dat
- xtrn/**/{GNUm,M}akefile
- xtrn/**/*.{c,h,cpp,hpp,mk}
"umonitor-$[[ inputs.os ]]": "umonitor-$[[ inputs.os ]]":
extends: extends:
......
...@@ -32,6 +32,7 @@ include: ...@@ -32,6 +32,7 @@ include:
cross_platform: 'yes' cross_platform: 'yes'
build_flags: 'AR=mingw32-ar AS=mingw32-as CC=mingw32-gcc CXX=mingw32-g++ RANLIB=mingw32-ranlib RELEASE=1 STATIC_CRYPTLIB=yes USE_SDL=1 VERBOSE=please WINDRES=mingw32-windres' build_flags: 'AR=mingw32-ar AS=mingw32-as CC=mingw32-gcc CXX=mingw32-g++ RANLIB=mingw32-ranlib RELEASE=1 STATIC_CRYPTLIB=yes USE_SDL=1 VERBOSE=please WINDRES=mingw32-windres'
no_javascript: 'yes' no_javascript: 'yes'
has_curses: 'no'
- local: '.gitlab-ci-unix.yml' - local: '.gitlab-ci-unix.yml'
inputs: inputs:
os: 'raspian' os: 'raspian'
......
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