prod: build and test github action now uses docker images from github…

… container registry
inet-framework · Mar 20, 2023 · f4a8899 · f4a8899
1 parent 1f8e95d
commit f4a8899
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/.github/workflows/build-and-tests.yml b/.github/workflows/build-and-tests.yml
@@ -22,12 +22,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Pull Docker image
-        run: docker pull omnetpp/travis-inet:6.0-220428
+        run: docker pull ghcr.io/inet-framework/ci-inet:6.0.1-230320
       - name: Build (native)
         run: |
           docker run -i --env TARGET_PLATFORM=linux --env MODE=${{ matrix.mode }} --env GITHUB_WORKSPACE \
             -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
-            omnetpp/travis-inet:6.0-220428 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-build.sh
+            ghcr.io/inet-framework/ci-inet:6.0.1-230320 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-build.sh
       - uses: actions/upload-artifact@v3
         with:
           name: libinet-so
@@ -43,12 +43,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Pull Docker image
-        run: docker pull omnetpp/travis-inet:6.0-220428
+        run: docker pull ghcr.io/inet-framework/ci-inet:6.0.1-230320
       - name: Build (cross)
         run: |
           docker run -i --env TARGET_PLATFORM=${{ matrix.target }} --env MODE=${{ matrix.mode }} --env GITHUB_WORKSPACE \
             -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
-            omnetpp/travis-inet:6.0-220428 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-build.sh
+            ghcr.io/inet-framework/ci-inet:6.0.1-230320 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-build.sh
 
   fingerprints:
     needs: build-native
@@ -65,12 +65,12 @@ jobs:
           name: libinet-so
           path: ${{ github.workspace }}/src/
       - name: Pull Docker image
-        run: docker pull omnetpp/travis-inet:6.0-220428
+        run: docker pull ghcr.io/inet-framework/ci-inet:6.0.1-230320
       - name: Fingerprint tests
         run: |
           docker run -i --env MODE=${{ matrix.mode }} --env GITHUB_WORKSPACE --env SPLIT_N=4 --env SPLIT_I=${{ matrix.split }} \
             -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
-            omnetpp/travis-inet:6.0-220428 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-fingerprints.sh
+            ghcr.io/inet-framework/ci-inet:6.0.1-230320 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-fingerprints.sh
 
   other-tests:
     needs: build-native
@@ -88,10 +88,10 @@ jobs:
           name: libinet-so
           path: ${{ github.workspace }}/src/
       - name: Pull Docker image
-        run: docker pull omnetpp/travis-inet:6.0-220428
+        run: docker pull ghcr.io/inet-framework/ci-inet:6.0.1-230320
       - name: Run ${{ matrix.testdir }} tests
         run: |
           docker run -i --env MODE=debug --env GITHUB_WORKSPACE --env TESTDIR=${{ matrix.testdir }} \
             -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
-            omnetpp/travis-inet:6.0-220428 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-other-tests.sh
+            ghcr.io/inet-framework/ci-inet:6.0.1-230320 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-other-tests.sh
 
diff --git a/.github/workflows/featuretests.yml b/.github/workflows/featuretests.yml
@@ -19,12 +19,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Pull Docker image
-        run: docker pull omnetpp/travis-inet:6.0-220428
+        run: docker pull ghcr.io/inet-framework/ci-inet:6.0.1-230320
       - name: Feature tests (split)
         run: |
           docker run -i --env SKIPPED_FEATURES="" --env SPLIT_INDEX=${{ matrix.node-index }} --env SPLIT_TOTAL=${{ matrix.node-total }} \
             --env GITHUB_WORKSPACE -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE \
-            omnetpp/travis-inet:6.0-220428 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-featuretests.sh
+            ghcr.io/inet-framework/ci-inet:6.0.1-230320 /bin/bash $GITHUB_WORKSPACE/_scripts/github/github-job-featuretests.sh
       - uses: actions/upload-artifact@v3
         if: always() # even if the test failed, of course
         with:

diff --git a/_scripts/github/github-job-build.sh b/_scripts/github/github-job-build.sh
@@ -28,8 +28,6 @@ cd $GITHUB_WORKSPACE
 
 . setenv -f
 
-cp -r /root/nsc-0.5.3 3rdparty
-
 echo "::group::Enable all features"
 opp_featuretool enable all 2>&1 # redirecting stderr so it doesn't get out of sync with stdout
 echo "::endgroup::"

diff --git a/_scripts/github/github-job-featuretests.sh b/_scripts/github/github-job-featuretests.sh
@@ -20,8 +20,6 @@ cd $GITHUB_WORKSPACE
 
 . setenv -f
 
-cp -r /root/nsc-0.5.3 3rdparty
-
 echo "::group::Run feature tests"
 cd tests/features
 ./featuretest | tee featuretest.out

diff --git a/_scripts/github/github-job-fingerprints.sh b/_scripts/github/github-job-fingerprints.sh
@@ -20,8 +20,6 @@ cd $GITHUB_WORKSPACE
 
 . setenv -f
 
-cp -r /root/nsc-0.5.3 3rdparty
-
 echo "::group::Enable all features"
 opp_featuretool enable all 2>&1 # redirecting stderr so it doesn't get out of sync with stdout
 echo "::endgroup::"

diff --git a/_scripts/github/github-job-other-tests.sh b/_scripts/github/github-job-other-tests.sh
@@ -21,8 +21,6 @@ cd $GITHUB_WORKSPACE
 
 . setenv -f
 
-cp -r /root/nsc-0.5.3 3rdparty
-
 echo "::group::Enable all features"
 opp_featuretool enable all  2>&1 # redirecting stderr so it doesn't get out of sync with stdout
 echo "::endgroup::"