Skip to content

Commit

Permalink
Revert "Migrate amd_centos executor to amd_ubuntu (#525)"
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathanrainer committed Jul 24, 2024
1 parent 24135cb commit 59f36fb
Showing 1 changed file with 28 additions and 18 deletions.
46 changes: 28 additions & 18 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ workflows:
name: Lint
matrix:
parameters:
platform: [amd_ubuntu]
platform: [amd_centos]
rust_channel: [stable]
command: [lint]
test:
Expand All @@ -53,7 +53,7 @@ workflows:
name: Run cargo tests (<< matrix.rust_channel >> rust on << matrix.platform >>)
matrix:
parameters:
platform: [amd_ubuntu, arm_ubuntu, amd_linux, amd_macos, arm_macos, amd_windows]
platform: [amd_centos, arm_ubuntu, amd_linux, amd_macos, arm_macos, amd_windows]
rust_channel: [stable]
command: [test]

Expand All @@ -71,19 +71,19 @@ workflows:
name: Run cargo tests (<< matrix.rust_channel >> rust on << matrix.platform >>)
matrix:
parameters:
platform: [amd_ubuntu, arm_ubuntu, amd_linux, amd_macos, arm_macos, amd_windows]
platform: [amd_centos, arm_ubuntu, amd_linux, amd_macos, arm_macos, amd_windows]
rust_channel: [stable]
command: [test]
<<: *any_release
- xtask:
name: Build and bundle release artifacts (<< matrix.platform >>)
matrix:
parameters:
platform: [amd_ubuntu, arm_ubuntu, amd_macos, arm_macos, amd_windows]
platform: [amd_centos, arm_ubuntu, amd_macos, arm_macos, amd_windows]
rust_channel: [stable]
command: [package]
requires:
- "Run cargo tests (stable rust on amd_ubuntu)"
- "Run cargo tests (stable rust on amd_centos)"
- "Run cargo tests (stable rust on arm_ubuntu)"
- "Run cargo tests (stable rust on amd_macos)"
- "Run cargo tests (stable rust on arm_macos)"
Expand All @@ -105,7 +105,7 @@ workflows:
parameters:
platform: [minimal_linux]
requires:
- "Build and bundle release artifacts (amd_ubuntu)"
- "Build and bundle release artifacts (amd_centos)"
- "Build and bundle release artifacts (arm_ubuntu)"
- "Build and bundle release artifacts (amd_macos)"
- "Build and bundle release artifacts (arm_macos)"
Expand All @@ -119,7 +119,7 @@ workflows:
parameters:
platform: [minimal_linux]
requires:
- "Run cargo tests (stable rust on amd_ubuntu)"
- "Run cargo tests (stable rust on amd_centos)"
- "Run cargo tests (stable rust on arm_ubuntu)"
- "Run cargo tests (stable rust on amd_macos)"
- "Run cargo tests (stable rust on arm_macos)"
Expand Down Expand Up @@ -235,6 +235,12 @@ executors:
environment:
XTASK_TARGET: "x86_64-pc-windows-msvc"

amd_centos: &amd_centos_executor
docker:
- image: centos:7
resource_class: xlarge
environment:
XTASK_TARGET: "x86_64-unknown-linux-gnu"
amd_linux: &amd_linux_build_executor
docker:
- image: cimg/base:stable
Expand All @@ -248,14 +254,6 @@ executors:
environment:
XTASK_TARGET: "aarch64-unknown-linux-gnu"

amd_ubuntu: &amd_ubuntu_executor
machine:
image: ubuntu-2004:2022.04.1
resource_class: xlarge
environment:
XTASK_TARGET: "x86_64-unknown-linux-gnu"
CAN_RUN_DOCKER: "true"

minimal_linux:
docker:
- image: cimg/base:stable
Expand All @@ -275,14 +273,26 @@ commands:
steps:
- when:
condition:
equal: [ *amd_ubuntu_executor, << parameters.platform >> ]
equal: [ *amd_centos_executor, << parameters.platform >> ]
steps:
- run:
name: Update and upgrade yum packages
command: sudo apt update
command: yum -y update && yum -y upgrade
- run:
name: Install development tools
command: sudo apt install build-essential
command: yum groupinstall -y "Development Tools"
- run:
name: Install gcc
command: yum -y install perl-core gcc
- run:
name: Install CMake
command: |
cd /usr/local/src
curl -LO https://github.com/Kitware/CMake/releases/download/v<< pipeline.parameters.linux_cmake_version >>/cmake-<< pipeline.parameters.linux_cmake_version >>-linux-x86_64.tar.gz
tar -xvf cmake-<< pipeline.parameters.linux_cmake_version >>-linux-x86_64.tar.gz
mv cmake-<< pipeline.parameters.linux_cmake_version >>-linux-x86_64 /usr/local/cmake
echo 'export PATH="/usr/local/cmake/bin:$PATH"' >> $BASH_ENV
source $BASH_ENV
- run:
name: Check glibc version
command: ldd --version
Expand Down

0 comments on commit 59f36fb

Please sign in to comment.