From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7840) id 225DA3858C60; Thu, 27 Apr 2023 01:22:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 225DA3858C60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682558572; bh=nLbwmmqTN60cGLUwuZhaRQopdyfHwiEJRSH6CDDgquQ=; h=From:To:Subject:Date:From; b=rs2nE7Fi9KlbBSV7CyBNdsKWRWBCIgqWZaQpSR3fW7IOm7H2nZSLnqJvN2WhZqRyC VJxsF5lwoBSBJmj172Wrj9qLcqwz4FEAsK5SegnMxhZ2aAywCa+JXfzju9rFQksJi4 C3qhH1YjWBTxcD5EHwoXgkbctuovMXO82lzqxx/U= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Eugene Rozenfeld To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/microsoft/heads/main)] Update Ubuntu environment to 22.04 since 18.04 environment is no longer supported by github actions. X-Act-Checkin: gcc X-Git-Author: Eugene Rozenfeld X-Git-Refname: refs/vendors/microsoft/heads/main X-Git-Oldrev: 81deaed9eaf1dd07947cdf7881aeda45b5088cf0 X-Git-Newrev: b0fadf99e22507ca49b92b4ff96b67a2d3c1543e Message-Id: <20230427012252.225DA3858C60@sourceware.org> Date: Thu, 27 Apr 2023 01:22:52 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b0fadf99e22507ca49b92b4ff96b67a2d3c1543e commit b0fadf99e22507ca49b92b4ff96b67a2d3c1543e Author: Eugene Rozenfeld Date: Tue Apr 18 18:41:19 2023 -0700 Update Ubuntu environment to 22.04 since 18.04 environment is no longer supported by github actions. Diff: --- .github/scripts/configure-gcc.sh | 15 ++------------- .github/workflows/build.yaml | 2 +- .github/workflows/delete-merge-branches.yaml | 2 +- .github/workflows/package-rpm.yaml | 2 +- .github/workflows/package-source-tarball.yaml | 2 +- .github/workflows/test-gcc.yaml | 4 ++-- .github/workflows/update-main.yaml | 10 +++++----- 7 files changed, 13 insertions(+), 24 deletions(-) diff --git a/.github/scripts/configure-gcc.sh b/.github/scripts/configure-gcc.sh index 69434f8a7bd..01362bd6bf8 100755 --- a/.github/scripts/configure-gcc.sh +++ b/.github/scripts/configure-gcc.sh @@ -22,19 +22,8 @@ sudo apt update -# Install gcc 7 and g++ 7 -sudo apt-get install gcc-7 g++-7 g++-7-multilib libstdc++-7-doc binutils-doc build-essential cpp-doc gcc-7-doc libstdc++6-7-dbg lib32stdc++6-7-dbg libx32stdc++6-7-dbg make autoconf automake libtool flex bison gdb gawk gcc-doc gfortran libgfortran3 libgcc1-dbg libgomp1-dbg libitm1-dbg libatomic1-dbg libasan4-dbg liblsan0-dbg libtsan0-dbg libubsan0-dbg libcilkrts5-dbg libmpx2-dbg libquadmath0-dbg glibc-doc python lynx -y - -# Redirect gcc and g++ to the installed versions -sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 -sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 60 - -# Redirect cc and c++ to the installed gcc and g++ versions: -sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 30 -sudo update-alternatives --set cc /usr/bin/gcc - -sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30 -sudo update-alternatives --set c++ /usr/bin/g++ +# Install gcc 11 and g++ 11 +sudo apt-get install binutils-doc cpp-doc gdb gcc-doc gcc-multilib glibc-source glibc-doc python2 lynx -y sudo apt install -y texinfo sudo apt-get install -y dejagnu diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d3e8b9cf980..7e6f09472b3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -39,7 +39,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - name: checkout uses: actions/checkout@v2 diff --git a/.github/workflows/delete-merge-branches.yaml b/.github/workflows/delete-merge-branches.yaml index 3e0930d62d6..5704c2a46b6 100644 --- a/.github/workflows/delete-merge-branches.yaml +++ b/.github/workflows/delete-merge-branches.yaml @@ -31,7 +31,7 @@ on: jobs: delete: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 outputs: config: ${{ steps.printNoSecretJson.outputs.noSecretConfigJson }} matrixTestSet: ${{ steps.printGCCTestSet.outputs.testSet }} diff --git a/.github/workflows/package-rpm.yaml b/.github/workflows/package-rpm.yaml index d37b85e8abd..685de17f2da 100644 --- a/.github/workflows/package-rpm.yaml +++ b/.github/workflows/package-rpm.yaml @@ -33,7 +33,7 @@ on: jobs: package: container: cblmariner2preview.azurecr.io/base/core:2.0 - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: # We need to install a minimum number of packages to run the workflow: git and ca-certificates. diff --git a/.github/workflows/package-source-tarball.yaml b/.github/workflows/package-source-tarball.yaml index 9615d2e6131..b7672c15ac1 100644 --- a/.github/workflows/package-source-tarball.yaml +++ b/.github/workflows/package-source-tarball.yaml @@ -33,7 +33,7 @@ on: jobs: package: container: cblmariner2preview.azurecr.io/base/core:2.0 - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: # We need to install a minimum number of packages to run the workflow: git and ca-certificates. diff --git a/.github/workflows/test-gcc.yaml b/.github/workflows/test-gcc.yaml index 63b85b79636..6520568d4be 100644 --- a/.github/workflows/test-gcc.yaml +++ b/.github/workflows/test-gcc.yaml @@ -47,7 +47,7 @@ on: jobs: init: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 outputs: config: ${{ steps.printNoSecretJson.outputs.noSecretConfigJson }} matrixTestSet: ${{ steps.printGCCTestSet.outputs.testSet }} @@ -103,7 +103,7 @@ jobs: matrix: ${{fromJSON(needs.init.outputs.matrixTestSet)}} # Avoid cancelling other matrix chunks even if one fails fail-fast: false - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - run: echo ${{needs.init.outputs.output1}} ${{needs.init.outputs.output2}} - run: echo $GITHUB_CONTEXT diff --git a/.github/workflows/update-main.yaml b/.github/workflows/update-main.yaml index 8168f4302fd..ebff8bebd93 100644 --- a/.github/workflows/update-main.yaml +++ b/.github/workflows/update-main.yaml @@ -40,7 +40,7 @@ on: jobs: gcc-master-build: name: Build the latest gcc/master toolchain - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 outputs: config: ${{ steps.printNoSecretJson.outputs.noSecretConfigJson }} masterSHA: ${{ steps.printCurrentSHA.outputs.currentSHA }} @@ -131,7 +131,7 @@ jobs: # Avoid cancelling other matrix chunks even if one fails fail-fast: false - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 @@ -193,7 +193,7 @@ jobs: parse-failures: name: Parse failures and start build and test runs with gcc/master merged into vendor/microsoft/main needs: [gcc-master-test, gcc-master-build] - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 outputs: newBranchName: ${{ steps.setBranchName.outputs.newBranchName }} steps: @@ -312,7 +312,7 @@ jobs: wait-build: name: Waiting on build with gcc/master merged into vendor/microsoft/main needs: [parse-failures] - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 outputs: newFailuresPatchExists: ${{ steps.check_failures_patch.outputs.files_exists }} steps: @@ -350,7 +350,7 @@ jobs: wait-test: name: Waiting on tests with gcc/master merged into vendor/microsoft/main needs: [parse-failures, wait-build, gcc-master-build] - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 outputs: newFailuresPatchExists: ${{ steps.check_failures_patch.outputs.files_exists }} steps: