resolve conflict.

python · Oct 10, 2024 · 753387e · 753387e
1 parent ebb5a00
commit 753387e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -195,18 +195,14 @@ jobs:
 
   build_ubuntu_ssltests:
     name: 'Ubuntu SSL tests with OpenSSL'
-<<<<<<< HEAD
     runs-on: ${{ matrix.os }}
-=======
-    runs-on: ubuntu-24.04
->>>>>>> 05cc76bc23 (change OS image in  github workflow to ubuntu-24.04)
     timeout-minutes: 60
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-24.04]
         openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}

diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml
@@ -14,15 +14,11 @@ jobs:
   build_ubuntu_reusable:
     name: 'build and test'
     timeout-minutes: 60
-<<<<<<< HEAD
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04]
-=======
-    runs-on: ubuntu-24.04
->>>>>>> 05cc76bc23 (change OS image in  github workflow to ubuntu-24.04)
+        os: [ubuntu-24.04]
     env:
       FORCE_COLOR: 1
       OPENSSL_VER: 3.0.15

diff --git a/Tools/build/regen-configure.sh b/Tools/build/regen-configure.sh
@@ -5,12 +5,7 @@ set -e -x
 # The check_generated_files job of .github/workflows/build.yml must kept in
 # sync with this script. Use the same container image than the job so the job
 # doesn't need to run autoreconf in a container.
-<<<<<<< HEAD
 IMAGE="ghcr.io/python/autoconf:2024.10.06.11200919239"
-=======
-IMAGE="ubuntu:24.04"
-DEPENDENCIES="autotools-dev autoconf autoconf-archive pkg-config"
->>>>>>> 05cc76bc23 (change OS image in  github workflow to ubuntu-24.04)
 AUTORECONF="autoreconf -ivf -Werror"
 
 WORK_DIR="/src"