Merge pull request #2148 from mavlink/pr-remove-fedora

docker/CI: remove Fedora images
mavlink · Oct 6, 2023 · 7016968 · 7016968
2 parents 48f1ad0 + 0fa0dad
commit 7016968
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 150 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -230,40 +230,6 @@ jobs:
       - name: Build package
         run: dpkg-buildpackage -us -uc -b
 
-  rpm-package:
-    name: ${{ matrix.container_name }} (package, non-mavsdk_server)
-    runs-on: ubuntu-20.04
-    container: mavsdk/mavsdk-${{ matrix.container_name }}
-    strategy:
-      matrix:
-        container_name: [fedora-34, fedora-35, fedora-36]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: git permission workaround
-        run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          git config --global --add safe.directory /github/workspace
-      - name: install dependencies
-        run: yum -y install perl-IPC-Cmd perl-Pod-Html
-      - name: configure
-        run: cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_MAVSDK_SERVER=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=install -DWERROR=OFF  -Bbuild/release -H.
-      - name: build
-        run: cmake --build build/release --target install -- -j2
-      - name: Package
-        if: startsWith(github.ref, 'refs/tags/v')
-        run: tools/create_packages.sh ./install . x86_64 mavsdk-devel
-      - name: Publish artefacts
-        if: startsWith(github.ref, 'refs/tags/v')
-        uses: svenstaro/upload-release-action@v1-release
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file_glob: true
-          file: '*.rpm'
-          tag: ${{ github.ref }}
-          overwrite: true
-
   dockcross-linux-arm:
     name: linux-${{ matrix.arch_name }}
     runs-on: ubuntu-20.04

diff --git a/docker/Dockerfile-Fedora-35 b/docker/Dockerfile-Fedora-35
diff --git a/docker/Dockerfile-Fedora-36 b/docker/Dockerfile-Fedora-36
diff --git a/docker/build_and_push_docker_images.sh b/docker/build_and_push_docker_images.sh
@@ -10,8 +10,6 @@ then
     DOCKER_CMD=podman
 fi
 
-$DOCKER_CMD build -f Dockerfile-Fedora-35 -t mavsdk/mavsdk-fedora-35 .
-$DOCKER_CMD build -f Dockerfile-Fedora-36 -t mavsdk/mavsdk-fedora-36 .
 $DOCKER_CMD build -f Dockerfile-Ubuntu-20.04 -t mavsdk/mavsdk-ubuntu-20.04 .
 $DOCKER_CMD build -f Dockerfile-Ubuntu-22.04 -t mavsdk/mavsdk-ubuntu-22.04 .
 $DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-PX4-SITL-v1.11 -t mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.11 .
@@ -23,8 +21,6 @@ $DOCKER_CMD build -f Dockerfile.dockcross-linux-armv6-custom -t mavsdk/mavsdk-do
 $DOCKER_CMD build -f Dockerfile.dockcross-linux-armv7-custom -t mavsdk/mavsdk-dockcross-linux-armv7-custom .
 $DOCKER_CMD build -f Dockerfile.dockcross-linux-arm64-custom -t mavsdk/mavsdk-dockcross-linux-arm64-custom .
 
-$DOCKER_CMD push mavsdk/mavsdk-fedora-35:latest
-$DOCKER_CMD push mavsdk/mavsdk-fedora-36:latest
 $DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04:latest
 $DOCKER_CMD push mavsdk/mavsdk-ubuntu-22.04:latest
 $DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.11:latest