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

Group Windows jobs, delete commented out old Linux jobs.

parent 94ebe063
No related branches found
No related tags found
1 merge request!455Update branch with changes from master
...@@ -50,22 +50,6 @@ include: ...@@ -50,22 +50,6 @@ include:
tagname: "Linux" tagname: "Linux"
has_gtk: "yes" has_gtk: "yes"
#sbbs-linux:
# tags: [Linux]
# image: gcc
# stage: build
# extends: .rules
# script:
# - cd src/sbbs3
# - make RELEASE=1 all
# - make RELEASE=1 gtkutils
# artifacts:
# name: sbbs-linux-x64
# paths:
# - "src/sbbs3/*.exe.release/*"
# - "src/sbbs3/*.lib.release/*"
# - "src/sbbs3/*/*.exe.release/*"
smoketest-jsexec-linux: smoketest-jsexec-linux:
tags: [Linux] tags: [Linux]
image: gcc image: gcc
...@@ -77,34 +61,7 @@ smoketest-jsexec-linux: ...@@ -77,34 +61,7 @@ smoketest-jsexec-linux:
- "*.exe.release/jsexec -C -c../../ctrl -r 'exit(0)'" - "*.exe.release/jsexec -C -c../../ctrl -r 'exit(0)'"
dependencies: ["linux-x64 [sbbs]"] dependencies: ["linux-x64 [sbbs]"]
#sexpots-linux: "windows-x86 [sbbs]":
# tags: [Linux]
# image: gcc
# stage: build
# extends: .rules
# script:
# - cd src/sexpots
# - make RELEASE=1
# artifacts:
# name: sexpots-linux-x64
# paths:
# - "src/sexpots/*.exe.release/*"
#syncterm-linux:
# tags: [Linux]
# image: gcc
# stage: build
# extends: .rules
# script:
# - cd src/syncterm
# - make RELEASE=1 PREFIX=/usr dpkg
# artifacts:
# name: syncterm-linux-x64
# paths:
# - "src/syncterm/*.exe.release/*"
# - "src/syncterm/syncterm*.deb"
sbbs-windows:
tags: [Windows] tags: [Windows]
stage: build stage: build
extends: .rules extends: .rules
...@@ -133,7 +90,7 @@ sbbs-windows: ...@@ -133,7 +90,7 @@ sbbs-windows:
- "src/sbbs3/*/*.exe" - "src/sbbs3/*/*.exe"
- "xtrn/*/*.exe" - "xtrn/*/*.exe"
sexpots-windows: "windows-x86 [sexpots]":
tags: [Windows] tags: [Windows]
stage: build stage: build
extends: .rules extends: .rules
...@@ -145,7 +102,7 @@ sexpots-windows: ...@@ -145,7 +102,7 @@ sexpots-windows:
paths: paths:
- "src/sexpots/Release/*.exe" - "src/sexpots/Release/*.exe"
svdm-windows: "windows-x86 [svdm]":
tags: [Windows] tags: [Windows]
stage: build stage: build
extends: .rules extends: .rules
...@@ -157,7 +114,7 @@ svdm-windows: ...@@ -157,7 +114,7 @@ svdm-windows:
paths: paths:
- "src/vdmodem/Release/*.exe" - "src/vdmodem/Release/*.exe"
syncterm-msvc: "windows-x86 [syncterm-msvc]":
tags: [Windows] tags: [Windows]
stage: build stage: build
extends: .rules extends: .rules
...@@ -169,32 +126,6 @@ syncterm-msvc: ...@@ -169,32 +126,6 @@ syncterm-msvc:
paths: paths:
- "src/syncterm/Release/*.exe" - "src/syncterm/Release/*.exe"
#syncdraw-linux:
# tags: [Linux]
# image: gcc
# stage: build
# extends: .rules
# script:
# - cd src/syncdraw
# - make RELEASE=1
# artifacts:
# name: syncdraw-linux-x64
# paths:
# - "src/syncdraw/*.exe.release/*"
#jsdoor-linux:
# tags: [Linux]
# image: gcc
# stage: build
# extends: .rules
# script:
# - cd src/sbbs3
# - make RELEASE=1 jsdoor
# artifacts:
# name: jsdoor-linux-x64
# paths:
# - "src/sbbs3/*.exe.release/*"
"freebsd-amd64 [sbbs-noskeeters]": "freebsd-amd64 [sbbs-noskeeters]":
extends: extends:
- .freebsd-build - .freebsd-build
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment