Use new gnuradio images

gnuradio · Jul 4, 2024 · 92d0f48 · 92d0f48
1 parent ce8fb56
commit 92d0f48
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -24,11 +24,11 @@ jobs:
         # container (i.e., what you want to docker-pull)
         distro:
           - name: 'Ubuntu 24.04'
-            containerid: 'ghcr.io/fair-acc/gr4-build-container:latest'
+            containerid: 'ghcr.io/gnuradio/gnuradio-docker:ubuntu-24.04'
             cxxflags: -Werror
-          #- name: 'Fedora 36'
-          #  containerid: 'ghcr.io/gnuradio/gnuradio-docker:fedora-36'
-          #  cxxflags: ''
+          - name: 'Fedora 40'
+            containerid: 'ghcr.io/gnuradio/gnuradio-docker:fedora-40'
+            cxxflags: ''
           # - distro: 'CentOS 8.3'
           #   containerid: 'gnuradio/ci:centos-8.3-3.9'
           #   cxxflags: -Werror
@@ -49,8 +49,6 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       name: Checkout Project
-    - name: install deps
-      run: sudo apt-get update && sudo apt-get install python3 python3-pip python3-setuptools python3-wheel ninja-build && sudo pip3 install meson --break-system-packages
     - name: Meson Setup
       env:
         CXX: ${{ matrix.compiler.command }}

diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
@@ -24,7 +24,7 @@ jobs:
         # container (i.e., what you want to docker-pull)
         distro:
           - name: 'Ubuntu 24.04'
-            containerid: 'ghcr.io/fair-acc/gr4-build-container:latest'
+            containerid: 'ghcr.io/gnuradio/gnuradio-docker:ubuntu-24.04'
             cxxflags: -Werror
         compiler:
           - name: "emscripten"