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

Split sbbs into sbbs-build that compiles and sbbs that just combines.

This will allow sbbs-build to run in parallel with scfg etc.
parent be4d2d75
No related branches found
No related tags found
No related merge requests found
Pipeline #6208 passed
...@@ -315,7 +315,7 @@ spec: ...@@ -315,7 +315,7 @@ spec:
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [uifc]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [uifc]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]"
"$[[ inputs.os ]]-$[[ inputs.platform ]] [sbbs]": "$[[ inputs.os ]]-$[[ inputs.platform ]] [sbbs-build]":
extends: extends:
- .$[[ inputs.os ]]-build - .$[[ inputs.os ]]-build
script: script:
...@@ -349,6 +349,36 @@ spec: ...@@ -349,6 +349,36 @@ spec:
- touch umonitor/smblib - touch umonitor/smblib
- $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS GIT=NO all - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS GIT=NO all
- $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS jsdoor - $[[ inputs.gnu_make ]] $[[ inputs.build_flags ]] $BUILD_ARGS jsdoor
artifacts:
expire_in: 30 mins
name: "sbbs-build-$[[ inputs.os ]]-$[[ inputs.platform ]]"
paths:
- "src/sbbs3/*.exe.release/*"
- "src/sbbs3/*.lib.release/*"
- "src/sbbs3/*/*.exe.release/*"
needs:
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [spidermonkey]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [cryptlib]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [xpdev]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [encode]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [hash]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [sftp]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [smblib]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [ciolib]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [uifc]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [gitinfo]"
rules:
- if: '"$[[ inputs.no_javascript ]]" == "yes"'
when: never
- if: '"$[[ inputs.cross_platform ]]" == "yes"'
when: never
- !reference [.rules, rules]
"$[[ inputs.os ]]-$[[ inputs.platform ]] [sbbs]":
extends:
- .$[[ inputs.os ]]-build
script:
- echo Combining artifacts
artifacts: artifacts:
name: "sbbs-$[[ inputs.os ]]-$[[ inputs.platform ]]" name: "sbbs-$[[ inputs.os ]]-$[[ inputs.platform ]]"
paths: paths:
...@@ -366,6 +396,7 @@ spec: ...@@ -366,6 +396,7 @@ spec:
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [ciolib]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [ciolib]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [uifc]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [uifc]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [gitinfo]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [gitinfo]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [sbbs-build]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [scfg]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [scfg]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [uedit]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [uedit]"
- job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [umonitor]" - job: "$[[ inputs.os ]]-$[[ inputs.platform ]] [umonitor]"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment