From b9dae0e341237d02518ba088d42ca692178eeedc Mon Sep 17 00:00:00 2001 From: ringabout <43030857+ringabout@users.noreply.github.com> Date: Wed, 30 Oct 2024 20:26:17 +0800 Subject: [PATCH 1/4] azure-pipelines update to ubuntu 24.04 gcc 14 --- .github/workflows/ci_gcc14.yml | 76 ---------------------------------- azure-pipelines.yml | 2 +- 2 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 .github/workflows/ci_gcc14.yml diff --git a/.github/workflows/ci_gcc14.yml b/.github/workflows/ci_gcc14.yml deleted file mode 100644 index fb286887a942..000000000000 --- a/.github/workflows/ci_gcc14.yml +++ /dev/null @@ -1,76 +0,0 @@ -name: GCC 14 -on: - pull_request: - push: - branches: - - 'devel' - - -jobs: - build: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - cpu: [amd64] - name: '${{ matrix.os }}' - runs-on: ${{ matrix.os }} - timeout-minutes: 60 # refs bug #18178 - steps: - - name: 'Checkout' - uses: actions/checkout@v4 - with: - fetch-depth: 2 - - - name: 'Install node.js 20.x' - uses: actions/setup-node@v4 - with: - node-version: '20.x' - - - name: 'Install dependencies (Linux amd64)' - if: runner.os == 'Linux' && matrix.cpu == 'amd64' - run: | - sudo apt update -qq - sudo apt remove needrestart - DEBIAN_FRONTEND='noninteractive' \ - sudo apt install --no-install-recommends -yq \ - libcurl4-openssl-dev libgc-dev libsdl1.2-dev libsfml-dev \ - valgrind libc6-dbg libblas-dev xorg-dev - - name: 'Install dependencies (Linux amd64 gcc 14)' - if: runner.os == 'Linux' && matrix.cpu == 'amd64' - run: | - sudo add-apt-repository universe - sudo apt update -qq - sudo apt install -y gcc-14 g++-14 libpcre3 liblapack-dev - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 60 --slave /usr/bin/g++ g++ /usr/bin/g++-14 - - name: 'Install dependencies (macOS)' - if: runner.os == 'macOS' - run: brew install boehmgc make sfml gtk+3 - - name: 'Install dependencies (Windows)' - if: runner.os == 'Windows' - shell: bash - run: | - set -e - . ci/funs.sh - nimInternalInstallDepsWindows - echo_run echo "${{ github.workspace }}/dist/mingw64/bin" >> "${GITHUB_PATH}" - - - name: 'Add build binaries to PATH' - shell: bash - run: echo "${{ github.workspace }}/bin" >> "${GITHUB_PATH}" - - - name: 'NIM_TESTAMENT_DISABLE_SSL' - shell: bash - run: echo "NIM_TESTAMENT_DISABLE_SSL=1" >> $GITHUB_ENV - - - name: 'System information' - shell: bash - run: . ci/funs.sh && nimCiSystemInfo - - - name: 'Build csourcesAny' - shell: bash - run: . ci/funs.sh && nimBuildCsourcesIfNeeded CC=gcc ucpu='${{ matrix.cpu }}' - - - name: 'koch, Run CI' - shell: bash - run: . ci/funs.sh && nimInternalBuildKochAndRunCI diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f075a9c51458..4ac5985d026f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: Linux_amd64: - vmImage: 'ubuntu-20.04' + vmImage: 'ubuntu-24.04' CPU: amd64 # regularly breaks, refs bug #17325 # Linux_i386: From b8e9e927a99be17f43ff7b1c372212dc4ad14401 Mon Sep 17 00:00:00 2001 From: ringabout <43030857+ringabout@users.noreply.github.com> Date: Wed, 30 Oct 2024 20:30:10 +0800 Subject: [PATCH 2/4] uses apt-get --- azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4ac5985d026f..116fdab94014 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -80,9 +80,9 @@ jobs: - bash: | set -e . ci/funs.sh - echo_run sudo apt-fast update -qq + echo_run sudo apt-get update -qq DEBIAN_FRONTEND='noninteractive' \ - echo_run sudo apt-fast install --no-install-recommends -yq \ + echo_run sudo apt-get install --no-install-recommends -yq \ libcurl4-openssl-dev libgc-dev libsdl1.2-dev libsfml-dev valgrind libc6-dbg displayName: 'Install dependencies (amd64 Linux)' condition: and(succeeded(), eq(variables['skipci'], 'false'), eq(variables['Agent.OS'], 'Linux'), eq(variables['CPU'], 'amd64')) @@ -100,12 +100,12 @@ jobs: Pin-Priority: 1001 EOF - # echo_run sudo apt-fast update -qq - echo_run sudo apt-fast update -qq || echo "failed, see bug #17343" + # echo_run sudo apt-get update -qq + echo_run sudo apt-get update -qq || echo "failed, see bug #17343" # `:i386` (e.g. in `libffi-dev:i386`) is needed otherwise you may get: # `could not load: libffi.so` during dynamic loading. DEBIAN_FRONTEND='noninteractive' \ - echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -yq \ + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -yq \ g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 From 989226a59aa1d838866b8bf45406fc6d391b1dd8 Mon Sep 17 00:00:00 2001 From: ringabout <43030857+ringabout@users.noreply.github.com> Date: Wed, 30 Oct 2024 21:22:36 +0800 Subject: [PATCH 3/4] gcc14 --- azure-pipelines.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 116fdab94014..abc1a9d8181c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -101,14 +101,17 @@ jobs: EOF # echo_run sudo apt-get update -qq + echo_run sudo add-apt-repository universe echo_run sudo apt-get update -qq || echo "failed, see bug #17343" # `:i386` (e.g. in `libffi-dev:i386`) is needed otherwise you may get: # `could not load: libffi.so` during dynamic loading. DEBIAN_FRONTEND='noninteractive' \ echo_run sudo apt-get install --no-install-recommends --allow-downgrades -yq \ - g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ + gcc-14 g++-14 libpcre3 liblapack-dev libpcre3 liblapack-dev g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 + echo_run sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 60 --slave /usr/bin/g++ g++ /usr/bin/g++-14 + cat << EOF > bin/gcc #!/bin/bash From b0cfc249203fa28b8328249840af4257af181fae Mon Sep 17 00:00:00 2001 From: ringabout <43030857+ringabout@users.noreply.github.com> Date: Wed, 30 Oct 2024 22:45:34 +0800 Subject: [PATCH 4/4] oops --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index abc1a9d8181c..9696c2086dd7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -80,10 +80,12 @@ jobs: - bash: | set -e . ci/funs.sh + echo_run sudo add-apt-repository universe echo_run sudo apt-get update -qq DEBIAN_FRONTEND='noninteractive' \ echo_run sudo apt-get install --no-install-recommends -yq \ - libcurl4-openssl-dev libgc-dev libsdl1.2-dev libsfml-dev valgrind libc6-dbg + gcc-14 g++-14 libpcre3 liblapack-dev libpcre3 liblapack-dev libcurl4-openssl-dev libgc-dev libsdl1.2-dev libsfml-dev valgrind libc6-dbg + echo_run sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 60 --slave /usr/bin/g++ g++ /usr/bin/g++-14 displayName: 'Install dependencies (amd64 Linux)' condition: and(succeeded(), eq(variables['skipci'], 'false'), eq(variables['Agent.OS'], 'Linux'), eq(variables['CPU'], 'amd64')) @@ -101,16 +103,14 @@ jobs: EOF # echo_run sudo apt-get update -qq - echo_run sudo add-apt-repository universe echo_run sudo apt-get update -qq || echo "failed, see bug #17343" # `:i386` (e.g. in `libffi-dev:i386`) is needed otherwise you may get: # `could not load: libffi.so` during dynamic loading. DEBIAN_FRONTEND='noninteractive' \ echo_run sudo apt-get install --no-install-recommends --allow-downgrades -yq \ - gcc-14 g++-14 libpcre3 liblapack-dev libpcre3 liblapack-dev g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ + g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 - echo_run sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 60 --slave /usr/bin/g++ g++ /usr/bin/g++-14 cat << EOF > bin/gcc #!/bin/bash