Skip to content

Commit e23d193

Browse files
committed
prod: build and test github action now uses docker images from github container registry
1 parent 1f8e95d commit e23d193

File tree

5 files changed

+10
-16
lines changed

5 files changed

+10
-16
lines changed

.github/workflows/build-and-tests.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v3
2424
- name: Pull Docker image
25-
run: docker pull omnetpp/travis-inet:6.0-220428
25+
run: docker pull ghcr.io/inet-framework/ci-inet:6.0.1-230320
2626
- name: Build (native)
2727
run: |
2828
docker run -i --env TARGET_PLATFORM=linux --env MODE=${{ matrix.mode }} --env GITHUB_WORKSPACE \
2929
-v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
30-
omnetpp/travis-inet:6.0-220428 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-build.sh
30+
ghcr.io/inet-framework/ci-inet:6.0.1-230320 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-build.sh
3131
- uses: actions/upload-artifact@v3
3232
with:
3333
name: libinet-so
@@ -43,12 +43,12 @@ jobs:
4343
steps:
4444
- uses: actions/checkout@v3
4545
- name: Pull Docker image
46-
run: docker pull omnetpp/travis-inet:6.0-220428
46+
run: docker pull ghcr.io/inet-framework/ci-inet:6.0.1-230320
4747
- name: Build (cross)
4848
run: |
4949
docker run -i --env TARGET_PLATFORM=${{ matrix.target }} --env MODE=${{ matrix.mode }} --env GITHUB_WORKSPACE \
5050
-v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
51-
omnetpp/travis-inet:6.0-220428 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-build.sh
51+
ghcr.io/inet-framework/ci-inet:6.0.1-230320 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-build.sh
5252
5353
fingerprints:
5454
needs: build-native
@@ -65,12 +65,12 @@ jobs:
6565
name: libinet-so
6666
path: ${{ github.workspace }}/src/
6767
- name: Pull Docker image
68-
run: docker pull omnetpp/travis-inet:6.0-220428
68+
run: docker pull ghcr.io/inet-framework/ci-inet:6.0.1-230320
6969
- name: Fingerprint tests
7070
run: |
7171
docker run -i --env MODE=${{ matrix.mode }} --env GITHUB_WORKSPACE --env SPLIT_N=4 --env SPLIT_I=${{ matrix.split }} \
7272
-v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
73-
omnetpp/travis-inet:6.0-220428 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-fingerprints.sh
73+
ghcr.io/inet-framework/ci-inet:6.0.1-230320 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-fingerprints.sh
7474
7575
other-tests:
7676
needs: build-native
@@ -88,10 +88,10 @@ jobs:
8888
name: libinet-so
8989
path: ${{ github.workspace }}/src/
9090
- name: Pull Docker image
91-
run: docker pull omnetpp/travis-inet:6.0-220428
91+
run: docker pull ghcr.io/inet-framework/ci-inet:6.0.1-230320
9292
- name: Run ${{ matrix.testdir }} tests
9393
run: |
9494
docker run -i --env MODE=debug --env GITHUB_WORKSPACE --env TESTDIR=${{ matrix.testdir }} \
9595
-v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
96-
omnetpp/travis-inet:6.0-220428 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-other-tests.sh
96+
ghcr.io/inet-framework/ci-inet:6.0.1-230320 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-other-tests.sh
9797

.github/workflows/featuretests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v3
2121
- name: Pull Docker image
22-
run: docker pull omnetpp/travis-inet:6.0-220428
22+
run: docker pull ghcr.io/inet-framework/ci-inet:6.0.1-230320
2323
- name: Feature tests (split)
2424
run: |
2525
docker run -i --env SKIPPED_FEATURES="" --env SPLIT_INDEX=${{ matrix.node-index }} --env SPLIT_TOTAL=${{ matrix.node-total }} \
2626
--env GITHUB_WORKSPACE -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
27-
omnetpp/travis-inet:6.0-220428 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-featuretests.sh
27+
ghcr.io/inet-framework/ci-inet:6.0.1-230320 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-featuretests.sh
2828
- uses: actions/upload-artifact@v3
2929
if: always() # even if the test failed, of course
3030
with:

_scripts/github/github-job-featuretests.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ cd $GITHUB_WORKSPACE
2020

2121
. setenv -f
2222

23-
cp -r /root/nsc-0.5.3 3rdparty
24-
2523
echo "::group::Run feature tests"
2624
cd tests/features
2725
./featuretest | tee featuretest.out

_scripts/github/github-job-fingerprints.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ cd $GITHUB_WORKSPACE
2020

2121
. setenv -f
2222

23-
cp -r /root/nsc-0.5.3 3rdparty
24-
2523
echo "::group::Enable all features"
2624
opp_featuretool enable all 2>&1 # redirecting stderr so it doesn't get out of sync with stdout
2725
echo "::endgroup::"

_scripts/github/github-job-other-tests.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ cd $GITHUB_WORKSPACE
2121

2222
. setenv -f
2323

24-
cp -r /root/nsc-0.5.3 3rdparty
25-
2624
echo "::group::Enable all features"
2725
opp_featuretool enable all 2>&1 # redirecting stderr so it doesn't get out of sync with stdout
2826
echo "::endgroup::"

0 commit comments

Comments
 (0)