Merge branch 'master' into go1.23

stellar · Jan 2, 2025 · 7eeeed5 · 7eeeed5
2 parents faf534f + 9c71a45
commit 7eeeed5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/galexie-release.yml b/.github/workflows/galexie-release.yml
@@ -8,7 +8,7 @@ jobs:
 
   publish-docker:
     name: Test and push docker image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       GALEXIE_INTEGRATION_TESTS_ENABLED: "true"
       GALEXIE_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core

diff --git a/.github/workflows/galexie.yml b/.github/workflows/galexie.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   galexie:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       CAPTIVE_CORE_DEBIAN_PKG_VERSION: 22.1.0-2194.0241e79f7.focal
       GALEXIE_INTEGRATION_TESTS_ENABLED: "true"

diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml
@@ -13,7 +13,7 @@ jobs:
         os: [ubuntu-20.04, ubuntu-22.04]
         go: ["1.22", "1.23"]
         pg: [12, 16]
-        protocol-version: [21, 22]
+        protocol-version: [22]
     runs-on: ${{ matrix.os }}
     services:
       postgres: