Revert "ci: add Ubuntu 24.04 build (#7527)"

This reverts commit 0e67c3d.
geldata · Jul 11, 2024 · b56134b · b56134b
1 parent 578b4e7
commit b56134b
Show file tree

Hide file tree

Showing 6 changed files with 196 additions and 1,039 deletions.
diff --git a/.github/workflows.src/build.inc.yml b/.github/workflows.src/build.inc.yml
@@ -30,29 +30,25 @@
 <% if tgt.family == "debian" %>
         idx_file=<< tgt.platform_version >>.nightly.json
         if [ ! -e "/tmp/$idx_file" ]; then
-          curl --fail -o /tmp/$idx_file -s https://packages.edgedb.com/apt/.jsonindexes/$idx_file || true
+          curl -s https://packages.edgedb.com/apt/.jsonindexes/$idx_file > /tmp/$idx_file
         fi
-        if [ -e "/tmp/$idx_file" ]; then
-          out=$(cat /tmp/$idx_file | jq -r --arg REV "$rev" --arg ARCH "<< tgt.arch >>" "$jq_filter")
-          if [ -n "$out" ]; then
-            echo 'Skip rebuilding existing << tgt.name >>'
-            val=false
-          fi
+        out=$(cat /tmp/$idx_file | jq -r --arg REV "$rev" --arg ARCH "<< tgt.arch >>" "$jq_filter")
+        if [ -n "$out" ]; then
+          echo 'Skip rebuilding existing << tgt.name >>'
+          val=false
         fi
 <% elif tgt.family == "redhat" %>
         idx_file=el<< tgt.platform_version >>.nightly.json
         if [ ! -e "/tmp/$idx_file" ]; then
-          curl --fail -o /tmp/$idx_file -s https://packages.edgedb.com/rpm/.jsonindexes/$idx_file || true
+          curl -s https://packages.edgedb.com/rpm/.jsonindexes/$idx_file > /tmp/$idx_file
         fi
-        if [ -e "/tmp/$idx_file" ]; then
-          out=$(cat /tmp/$idx_file | jq -r --arg REV "$rev" --arg ARCH "<< tgt.arch >>" "$jq_filter")
-          if [ -n "$out" ]; then
-            echo 'Skip rebuilding existing << tgt.name >>'
-            val=false
-          fi
+        out=$(cat /tmp/$idx_file | jq -r --arg REV "$rev" --arg ARCH "<< tgt.arch >>" "$jq_filter")
+        if [ -n "$out" ]; then
+          echo 'Skip rebuilding existing << tgt.name >>'
+          val=false
         fi
 <% elif tgt.family == "generic" %>
-        out=$(curl --fail -s https://packages.edgedb.com/archive/.jsonindexes/<< tgt.platform_version >>-unknown-linux-<< "{}".format(tgt.platform_libc) if tgt.platform_libc else "gnu" >>.nightly.json | jq -r --arg REV "$rev" --arg ARCH "<< tgt.arch >>" "$jq_filter" || true)
+        out=$(curl -s https://packages.edgedb.com/archive/.jsonindexes/<< tgt.platform_version >>-unknown-linux-<< "{}".format(tgt.platform_libc) if tgt.platform_libc else "gnu" >>.nightly.json | jq -r --arg REV "$rev" --arg ARCH "<< tgt.arch >>" "$jq_filter")
         if [ -n "$out" ]; then
           echo 'Skip rebuilding existing << tgt.name >>'
           val=false
@@ -63,13 +59,13 @@
 <% for tgt in targets.macos %>
         val=true
 <% if tgt.platform == "macos" %>
-        out=$(curl --fail -s https://packages.edgedb.com/archive/.jsonindexes/<< tgt.platform_version >>-apple-darwin.nightly.json | jq -r --arg REV "$rev" --arg ARCH "<< tgt.arch >>" "$jq_filter" || true)
+        out=$(curl -s https://packages.edgedb.com/archive/.jsonindexes/<< tgt.platform_version >>-apple-darwin.nightly.json | jq -r --arg REV "$rev" --arg ARCH "<< tgt.arch >>" "$jq_filter")
         if [ -n "$out" ]; then
           echo 'Skip rebuilding existing << tgt.platform >>-<< tgt.platform_version >>'
           val=false
         fi
 <% elif tgt.platform == "win" %>
-        out=$(curl --fail -s https://packages.edgedb.com/archive/.jsonindexes/<< tgt.platform_version >>-pc-windows-msvc.nightly.json | jq -r --arg REV "$rev" --arg ARCH "<< tgt.arch >>" "$jq_filter" || true)
+        out=$(curl -s https://packages.edgedb.com/archive/.jsonindexes/<< tgt.platform_version >>-pc-windows-msvc.nightly.json | jq -r --arg REV "$rev" --arg ARCH "<< tgt.arch >>" "$jq_filter")
         if [ -n "$out" ]; then
           echo 'Skip rebuilding existing << tgt.platform >>-<< tgt.platform_version >>'
           val=false

diff --git a/.github/workflows.src/build.targets.yml b/.github/workflows.src/build.targets.yml
@@ -78,17 +78,6 @@ targets:
           platform: ubuntu
           platform_version: jammy
           family: debian
-        - name: ubuntu-noble-x86_64
-          arch: x86_64
-          platform: ubuntu
-          platform_version: noble
-          family: debian
-          runs_on: [package-builder, self-hosted, linux, x64]
-        - name: ubuntu-noble-aarch64
-          arch: aarch64
-          platform: ubuntu
-          platform_version: noble
-          family: debian
           runs_on: [package-builder, self-hosted, linux, arm64]
         - name: centos-8-x86_64
           arch: x86_64