Revert "ci: disable oldstable for now due to breaking builds from 1.2…

…3.x -> 1.24 in x/sys and x/net" This reverts commit 542c619.
moov-io · Feb 17, 2025 · aa8a98c · aa8a98c
1 parent b0b83bd
commit aa8a98c
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 73 deletions.
diff --git a/.github/workflows/cgo.yml b/.github/workflows/cgo.yml
@@ -2,9 +2,9 @@ name: Go
 
 on:
   push:
-    branches: [master]
+    branches: [ master ]
   pull_request:
-    branches: [master]
+    branches: [ master ]
 
 jobs:
   build:
@@ -13,37 +13,35 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        # TODO: re-enable oldstable after 1.25.x
-        # version: [stable, oldstable]
-        version: [stable]
+        version: [stable, oldstable]
     steps:
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ matrix.version }}
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-
-      - name: Install make (Windows)
-        if: runner.os == 'Windows'
-        run: choco install -y make mingw
-
-      - name: Setup
-        if: runner.os == 'Linux'
-        run: make setup
-
-      - name: Check
-        if: runner.os == 'Linux'
-        run: make check
-
-      - name: Short Check
-        if: runner.os != 'Linux'
-        run: make check
-        env:
-          GOTEST_FLAGS: "-short"
-
-      - name: Logs
-        if: failure() && runner.os == 'Linux'
-        run: docker compose logs
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v5
+      with:
+        go-version: ${{ matrix.version }}
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v4
+
+    - name: Install make (Windows)
+      if: runner.os == 'Windows'
+      run: choco install -y make mingw
+
+    - name: Setup
+      if: runner.os == 'Linux'
+      run: make setup
+
+    - name: Check
+      if: runner.os == 'Linux'
+      run: make check
+
+    - name: Short Check
+      if: runner.os != 'Linux'
+      run: make check
+      env:
+        GOTEST_FLAGS: "-short"
+
+    - name: Logs
+      if: failure() && runner.os == 'Linux'
+      run: docker compose logs
diff --git a/.github/workflows/nocgo.yml b/.github/workflows/nocgo.yml
@@ -2,9 +2,9 @@ name: Go
 
 on:
   push:
-    branches: [master]
+    branches: [ master ]
   pull_request:
-    branches: [master]
+    branches: [ master ]
 
 jobs:
   build:
@@ -13,40 +13,38 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        # TODO: re-enable oldstable after 1.25.x
-        # version: [stable, oldstable]
-        version: [stable]
+        version: [stable, oldstable]
     steps:
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ matrix.version }}
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-
-      - name: Install make (Windows)
-        if: runner.os == 'Windows'
-        run: choco install -y make mingw
-
-      - name: Setup
-        if: runner.os == 'Linux'
-        run: make setup
-
-      - name: Check
-        if: runner.os == 'Linux'
-        run: make check
-        env:
-          CGO_ENABLED: "0"
-
-      - name: Short Check
-        if: runner.os != 'Linux'
-        run: make check
-        env:
-          CGO_ENABLED: "0"
-          GOTEST_FLAGS: "-short"
-
-      - name: Logs
-        if: failure() && runner.os == 'Linux'
-        run: docker compose logs
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v5
+      with:
+        go-version: ${{ matrix.version }}
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v4
+
+    - name: Install make (Windows)
+      if: runner.os == 'Windows'
+      run: choco install -y make mingw
+
+    - name: Setup
+      if: runner.os == 'Linux'
+      run: make setup
+
+    - name: Check
+      if: runner.os == 'Linux'
+      run: make check
+      env:
+        CGO_ENABLED: "0"
+
+    - name: Short Check
+      if: runner.os != 'Linux'
+      run: make check
+      env:
+        CGO_ENABLED: "0"
+        GOTEST_FLAGS: "-short"
+
+    - name: Logs
+      if: failure() && runner.os == 'Linux'
+      run: docker compose logs