Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganize dependency files, and add RTEMS jobs #161

Merged
merged 1 commit into from
Sep 17, 2022
Merged

Reorganize dependency files, and add RTEMS jobs #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,23 +92,30 @@ environment:

matrix:
- CMP: vs2019
SET: base7
BASE: "7.0"
SET: "deps2"
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- CMP: gcc
SET: base7
BASE: "7.0"
SET: "deps2"
- CMP: vs2019
SET: base3-15
BASE: "3.15"
SET: "deps2"
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- CMP: vs2019
SET: base3-14
BASE: "3.14"
SET: "deps1"
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
#- CMP: vs2017
# SET: base7
# BASE: "7.0"
# SET: "deps2"
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- CMP: vs2015
SET: base7
BASE: "7.0"
SET: "deps2"
#- CMP: vs2013
# SET: base7
# BASE: "7.0"
# SET: "deps2"

# Platform: processor architecture
platform:
Expand Down
9 changes: 0 additions & 9 deletions .ci-local/base3-15.set
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions .ci-local/deps-latest.set
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
MODULES="sncseq sscan calc ipac"

BASE_RECURSIVE=no

SNCSEQ=master
SSCAN=master
CALC=master
IPAC=master
1 change: 0 additions & 1 deletion .ci-local/base3-14.set → .ci-local/deps1.set
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
MODULES="sncseq sscan calc ipac"

BASE=3.14
BASE_RECURSIVE=no

SNCSEQ=R2-2-8
Expand Down
1 change: 0 additions & 1 deletion .ci-local/base7.set → .ci-local/deps2.set
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
MODULES="sncseq sscan calc ipac"

BASE=7.0
BASE_RECURSIVE=no

SNCSEQ=R2-2-8
Expand Down
3 changes: 3 additions & 0 deletions .ci-local/no-deps.set
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
MODULES=""

BASE_RECURSIVE=no
41 changes: 33 additions & 8 deletions .github/workflows/ci-scripts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ env:

jobs:
test:
name: ${{ matrix.os }}/${{ matrix.deps }}/${{ matrix.base }}/${{ matrix.cmp }}/${{ matrix.configuration }}
name: ${{ matrix.os }}/${{ matrix.deps }}/${{ matrix.base }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.cross }}
runs-on: ${{ matrix.os }}
env:
CMP: ${{ matrix.cmp }}
BCFG: ${{ matrix.configuration }}
BASE: ${{ matrix.base }}
SET: ${{ matrix.deps }}
CI_CROSS_TARGETS: ${{ matrix.cross }}
TEST: ${{ matrix.test }}
APT: re2c
CHOCO: re2c
BREW: re2c
Expand All @@ -33,48 +35,71 @@ jobs:
cmp: gcc
configuration: default
base: "7.0"
deps: "base7"
deps: "deps2"

- os: ubuntu-latest
cmp: gcc
configuration: static
base: "7.0"
deps: "base7"
deps: "deps2"

- os: ubuntu-latest
cmp: gcc
configuration: static
base: "7.0"
deps: "base7"
deps: "deps2"

- os: ubuntu-latest
cmp: gcc
configuration: default
base: "3.15"
deps: "no-deps"

- os: ubuntu-latest
cmp: gcc
configuration: static
base: "3.15"
deps: "base3-15"
deps: "deps2"

- os: ubuntu-latest
cmp: gcc
configuration: static
base: "3.14"
deps: "base3-14"
deps: "deps1"

- os: windows-2019
cmp: vs2019
configuration: default
base: "7.0"
deps: "base7"
deps: "deps2"

- os: windows-2019
cmp: vs2019
configuration: static
base: "7.0"
deps: "base7"
deps: "deps2"

- os: ubuntu-latest
cmp: gcc
configuration: default
base: "7.0"
deps: "no-deps"
cross: "RTEMS-pc386-qemu@4.9"

- os: ubuntu-latest
cmp: gcc
configuration: default
base: "7.0"
deps: "no-deps"
cross: "RTEMS-pc386-qemu@4.10"
test: NO

# - os: ubuntu-latest
# cmp: gcc
# configuration: default
# base: "7.0"
# deps: "no-deps"
# cross: "RTEMS-pc686-qemu@5"
steps:
- uses: actions/checkout@v2
with:
Expand Down