libtiff: Merge remote-tracking branch 'origin/master' into cmake-msvc-options

From c3f0b90df5bff0e0fddaf067f095c9dfa9e4b84e Mon Sep 17 00:00:00 2001
From: Roger Leigh <[EMAIL REDACTED]>
Date: Sun, 29 May 2022 19:38:01 +0100
Subject: [PATCH] ci: Remove arm64 temporarily

---
 .gitlab-ci.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef993112..23abeeb9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,14 +22,6 @@ cmake-ninja:
   script:
     - sh build/gitlab-ci cmake "Ninja" Debug
 
-cmake-ninja-arm64:
-  tags: [arm64,freebsd]
-  stage: build
-  script:
-    - sh build/gitlab-ci cmake "Ninja" Release
-  rules:
-    - if: '$CI_PROJECT_PATH == "libtiff/libtiff"'
-
 coverity:
   stage: static-analysis
   image: registry.gitlab.com/libtiff/libtiff-ci-ubuntu20.04-coverity:latest