From b78c51066fa7dee29eba5ee244f9884f7e082409 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Fri, 21 Jun 2024 10:21:45 +0200 Subject: [PATCH] CI: Migrate ARM64 builds from TravisCI to CircleCI --- .circleci/config.yml | 35 +++++++++++++++++++++++++++++++++++ .travis.yml | 23 ----------------------- README.md | 4 ++-- build/Shims.cs | 4 ---- 4 files changed, 37 insertions(+), 29 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 .travis.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..8f6a8c1a --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,35 @@ +version: 2.1 + +workflows: + build: + jobs: + - linux-arm64-glibc-net-8: + filters: + tags: + only: /^v.*/ + - linux-arm64-musl-net-8: + filters: + tags: + only: /^v.*/ + +jobs: + linux-arm64-glibc-net-8: + resource_class: arm.medium + machine: + image: ubuntu-2204:current + steps: + - checkout + - run: | + sudo docker run -dit --name netvips -e CI -v "$(pwd):/mnt/netvips" -w /mnt/netvips mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-arm64v8 + sudo docker exec netvips sh -c "apt-get update && apt-get install -y fontconfig-config" + - run: sudo docker exec netvips bash -c "./build.sh" + linux-arm64-musl-net-8: + resource_class: arm.medium + machine: + image: ubuntu-2204:current + steps: + - checkout + - run: | + sudo docker run -dit --name netvips -e CI -v "$(pwd):/mnt/netvips" -w /mnt/netvips mcr.microsoft.com/dotnet/sdk:8.0-alpine3.19-arm64v8 + sudo docker exec netvips sh -c "apk add bash font-noto --update-cache" + - run: sudo docker exec netvips bash -c "./build.sh" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 59c2a326..00000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -jobs: - allow_failures: - - arch: arm64 - fast_finish: true - include: - - name: "Linux ARM64v8 (Debian 12, glibc 2.36) - .NET 8.0" - arch: arm64 - os: linux - dist: focal - language: shell - install: - - sudo docker run -dit --name netvips -e TRAVIS -v $(pwd):/mnt/netvips -w /mnt/netvips mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-arm64v8 - - sudo docker exec netvips sh -c "apt-get update && apt-get install -y fontconfig-config" - script: sudo docker exec netvips bash -c "./build.sh" - - name: "Linux ARM64v8 (Alpine 3.18, musl 1.2.4) - .NET 8.0" - arch: arm64 - os: linux - dist: focal - language: shell - install: - - sudo docker run -dit --name netvips -e TRAVIS -v $(pwd):/mnt/netvips -w /mnt/netvips mcr.microsoft.com/dotnet/sdk:8.0-alpine3.18-arm64v8 - - sudo docker exec netvips sh -c "apk add bash font-noto --update-cache" - script: sudo docker exec netvips bash -c "./build.sh" diff --git a/README.md b/README.md index ca78c693..240f2f2c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # NetVips [![NuGet](https://img.shields.io/nuget/v/NetVips.svg)](https://www.nuget.org/packages/NetVips) -[![CI status (x64 Linux, macOS and Windows)](https://github.com/kleisauke/net-vips/workflows/CI/badge.svg?branch=master)](https://github.com/kleisauke/net-vips/actions) -[![CI status (Linux ARM64v8)](https://app.travis-ci.com/kleisauke/net-vips.svg?branch=master)](https://app.travis-ci.com/kleisauke/net-vips) +[![CI status (x64 Linux, macOS and Windows)](https://github.com/kleisauke/net-vips/workflows/CI/badge.svg)](https://github.com/kleisauke/net-vips/actions) +[![CI status (Linux ARM64v8)](https://circleci.com/gh/kleisauke/net-vips.svg?style=shield)](https://circleci.com/gh/kleisauke/net-vips) [![CI status (NetVips nightly packaging)](https://ci.appveyor.com/api/projects/status/d2r9uanb5yij07pt/branch/master?svg=true)](https://ci.appveyor.com/project/kleisauke/net-vips/branch/master) This NuGet package provides a .NET binding for the [libvips image processing library](https://libvips.github.io/libvips). diff --git a/build/Shims.cs b/build/Shims.cs index 83736d48..0b45004c 100644 --- a/build/Shims.cs +++ b/build/Shims.cs @@ -9,7 +9,6 @@ using Nuke.Common.CI; using Nuke.Common.CI.AppVeyor; using Nuke.Common.CI.GitHubActions; -using Nuke.Common.CI.TravisCI; public partial class Build { @@ -36,9 +35,6 @@ public static string GetVersion() case GitHubActions gitHubActions: buildNumber = gitHubActions.RunNumber; break; - case TravisCI travis: - buildNumber = travis.BuildNumber; - break; case AppVeyor appVeyor: buildNumber = appVeyor.BuildNumber; break;