From 2bbdc467f4fc894c64ffa6cc6ef623f22fc35fe2 Mon Sep 17 00:00:00 2001
From: Jamil Bou Kheir <jamil@elbii.com>
Date: Sun, 11 Jul 2021 23:23:50 -0700
Subject: [PATCH] Remove fedora 32 (EOL)

---
 .ci/build_fedora_32.sh   | 22 ----------------------
 .ci/build_fedora_33.sh   |  2 +-
 .ci/build_fedora_34.sh   |  2 +-
 .ci/build_fedora_35.sh   |  2 +-
 .github/workflows/ci.yml |  2 --
 5 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100755 .ci/build_fedora_32.sh

diff --git a/.ci/build_fedora_32.sh b/.ci/build_fedora_32.sh
deleted file mode 100755
index 960c8b5f6..000000000
--- a/.ci/build_fedora_32.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-OS="redhat_8"
-ARCH=${MATRIX_ARCH:-`uname -m`}
-PKG_DIR="${OS}_${ARCH}"
-PKG_FILE="${PKG_DIR}.rpm"
-IMAGE="${OS}_${ARCH}:latest"
-BASE_IMAGE="fedora:32"
-
-docker build \
-  -t $IMAGE \
-  -f pkg/Dockerfile.rpm \
-  --platform linux/$ARCH \
-  --build-arg PKG_DIR=$PKG_DIR \
-  --build-arg BASE_IMAGE=$BASE_IMAGE \
-  --progress plain \
-  .
-
-CID=$(docker create $IMAGE)
-mkdir -p _build
-docker cp $CID:/build/pkg/$PKG_FILE ./_build/firezone_$PKG_FILE
diff --git a/.ci/build_fedora_33.sh b/.ci/build_fedora_33.sh
index 34fbfa2ec..2e62fae51 100755
--- a/.ci/build_fedora_33.sh
+++ b/.ci/build_fedora_33.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-OS="redhat_8"
+OS="fedora_33"
 ARCH=${MATRIX_ARCH:-`uname -m`}
 PKG_DIR="${OS}_${ARCH}"
 PKG_FILE="${PKG_DIR}.rpm"
diff --git a/.ci/build_fedora_34.sh b/.ci/build_fedora_34.sh
index f4c3619ca..905339290 100755
--- a/.ci/build_fedora_34.sh
+++ b/.ci/build_fedora_34.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-OS="redhat_8"
+OS="fedora_34"
 ARCH=${MATRIX_ARCH:-`uname -m`}
 PKG_DIR="${OS}_${ARCH}"
 PKG_FILE="${PKG_DIR}.rpm"
diff --git a/.ci/build_fedora_35.sh b/.ci/build_fedora_35.sh
index a8698c1f2..64f96533d 100755
--- a/.ci/build_fedora_35.sh
+++ b/.ci/build_fedora_35.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-OS="redhat_8"
+OS="fedora_35"
 ARCH=${MATRIX_ARCH:-`uname -m`}
 PKG_DIR="${OS}_${ARCH}"
 PKG_FILE="${PKG_DIR}.rpm"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 206aa46e3..c2ada3028 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,7 +79,6 @@ jobs:
           - centos_7
           - centos_8
           - debian_10
-          - fedora_32
           - fedora_33
           - fedora_34
           - fedora_35
@@ -144,7 +143,6 @@ jobs:
           # - centos_7
           # - centos_8
           # - debian_10
-          # - fedora_32
           # - fedora_33
           # - fedora_34
           # - fedora_35