Bump CircleCI image to 11.4 and remove the need for libxml install

This commit is contained in:
Olivier Halligon
2020-05-17 18:45:31 +02:00
parent 4da5440425
commit 2ea4f1b470
3 changed files with 17 additions and 15 deletions
+15 -13
View File
@@ -6,7 +6,7 @@ defaults:
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
BUNDLE_PATH: vendor/bundle
macos:
xcode: "11.3.1"
xcode: "11.4.0"
shell: /bin/bash --login -eo pipefail
- &prepare-storage
run:
@@ -17,7 +17,8 @@ defaults:
name: Enable Ruby Auto-Switching
command: >
echo "source /usr/local/share/chruby/chruby.sh" >> ~/.bash_profile;
echo "source /usr/local/share/chruby/auto.sh" >> ~/.bash_profile
echo "source /usr/local/share/chruby/auto.sh" >> ~/.bash_profile;
chruby
- &restore-gems
restore_cache:
keys:
@@ -103,17 +104,18 @@ jobs:
- *restore-gems
- *install-gems
- *store-gems
- restore_cache:
keys:
- homebrew-{{ checksum ".circleci/config.yml" }}
- homebrew-
- run:
name: Install libxml2
command: brew install libxml2 && brew link --force libxml2
- save_cache:
key: homebrew-{{ checksum ".circleci/config.yml" }}
paths:
- /usr/local/Homebrew
# libxml2 is not needed anymore with latest Kanna and Xcode 11.4+
# - restore_cache:
# keys:
# - homebrew-{{ checksum ".circleci/config.yml" }}
# - homebrew-
# - run:
# name: Install libxml2
# command: brew install libxml2 && brew link --force libxml2
# - save_cache:
# key: homebrew-{{ checksum ".circleci/config.yml" }}
# paths:
# - /usr/local/Homebrew
- run:
# TODO: This should run the tests once SPM supports testing an executable
name: Build with SPM
+1 -1
View File
@@ -1 +1 @@
2.6.5
2.6.6
+1 -1
View File
@@ -15,7 +15,7 @@ SCHEME_NAME = 'swiftgen'.freeze
CONFIGURATION = 'Debug'.freeze
RELEASE_CONFIGURATION = 'Release'.freeze
POD_NAME = 'SwiftGen'.freeze
MIN_XCODE_VERSION = 11.2
MIN_XCODE_VERSION = 11.4
BUILD_DIR = File.absolute_path('./build')
BIN_NAME = 'swiftgen'.freeze