Skip to content

Commit

Permalink
Revert temporary makensis workaround since upstream is fixed now (#1828)
Browse files Browse the repository at this point in the history 
* Revert "Revert to older makensis for homebrew, fixes #1773 (#1783)"

This reverts commit 61afbb5.

* Update cache keys to a new version to get fresh cache

* Try with latest xcode version to see if we can resolve osslsigncode 2.0 problem
  • Loading branch information
@rfay
rfay committed Sep 12, 2019
1 parent e59d710 commit d07e310
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 41 deletions.
66 changes: 33 additions & 33 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
- run: sudo mkdir /home/linuxbrew && sudo chown $(id -u) /home/linuxbrew
- restore_cache:
keys:
- homebrew-linux-v6
- homebrew-linux-v7
- run:
command: ./.circleci/linux_circle_vm_setup.sh
name: NORMAL Circle VM setup - tools, docker, golang
- save_cache:
key: homebrew-linux-v6
key: homebrew-linux-v7
paths:
- /home/linuxbrew

Expand All @@ -42,13 +42,13 @@ jobs:
- run: sudo mkdir /home/linuxbrew && sudo chown $(id -u) /home/linuxbrew
- restore_cache:
keys:
- homebrew-linux-v6
- homebrew-linux-v7
# Run the built-in ddev tests with the executables just built.
- run:
command: ./.circleci/linux_circle_vm_setup.sh
name: Circle VM setup - tools, docker, golang
- save_cache:
key: homebrew-linux-v6
key: homebrew-linux-v7
paths:
- /home/linuxbrew

Expand All @@ -62,7 +62,7 @@ jobs:

mac_nginx_fpm_test:
macos:
xcode: "10.2.1"
xcode: "11.0.0"
working_directory: ~/ddev
environment:
DDEV_TEST_WEBSERVER_TYPE: nginx-fpm
Expand All @@ -73,14 +73,14 @@ jobs:
at: ~/
- restore_cache:
keys:
- homebrew-macos-v11
- homebrew-macos-v12
# Run the built-in ddev tests with the executables just built.
- run:
command: ./.circleci/macos_circle_vm_setup.sh
name: macOS Circle VM setup - tools, docker, golang
# Now build using the regular ddev-only technique - this results in a fully clean set of executables.
- save_cache:
key: homebrew-macos-v11
key: homebrew-macos-v12
paths:
- /usr/local/Homebrew
- /usr/local/Cellar
Expand All @@ -94,7 +94,7 @@ jobs:

mac_apache_fpm_test:
macos:
xcode: "10.2.1"
xcode: "11.0.0"
working_directory: ~/ddev
environment:
DDEV_TEST_WEBSERVER_TYPE: apache-fpm
Expand All @@ -105,7 +105,7 @@ jobs:
at: ~/
- restore_cache:
keys:
- homebrew-macos-v11
- homebrew-macos-v12
# Run the built-in ddev tests with the executables just built.
- run:
command: ./.circleci/macos_circle_vm_setup.sh
Expand All @@ -118,15 +118,15 @@ jobs:
- store_test_results:
path: /tmp/testresults
- save_cache:
key: homebrew-macos-v11
key: homebrew-macos-v12
paths:
- /usr/local/Homebrew
- /usr/local/Cellar
- ~/Library/Caches/Homebrew

mac_nfsmount_test:
macos:
xcode: "10.2.1"
xcode: "11.0.0"
working_directory: ~/ddev
environment:
DDEV_TEST_USE_NFSMOUNT: "true"
Expand All @@ -137,13 +137,13 @@ jobs:
at: ~/
- restore_cache:
keys:
- homebrew-macos-v11
- homebrew-macos-v12
# Run the built-in ddev tests with the executables just built.
- run:
command: ./.circleci/macos_circle_vm_setup.sh
name: macOS Circle VM setup - tools, docker, golang
- save_cache:
key: homebrew-macos-v11
key: homebrew-macos-v12
paths:
- /usr/local/Homebrew
- /usr/local/Cellar
Expand All @@ -168,14 +168,14 @@ jobs:
- run: sudo mkdir /home/linuxbrew && sudo chown $(id -u) /home/linuxbrew
- restore_cache:
keys:
- homebrew-linux-v6
- homebrew-linux-v7
- attach_workspace:
at: ~/
- run:
command: ./.circleci/linux_circle_vm_setup.sh
name: Circle VM setup - tools, docker, golang
- save_cache:
key: homebrew-linux-v6
key: homebrew-linux-v7
paths:
- /home/linuxbrew

Expand All @@ -201,14 +201,14 @@ jobs:
- run: sudo mkdir /home/linuxbrew && sudo chown $(id -u) /home/linuxbrew
- restore_cache:
keys:
- homebrew-linux-v6
- homebrew-linux-v7
- attach_workspace:
at: ~/
- run:
command: ./.circleci/linux_circle_vm_setup.sh
name: Circle VM setup - tools, docker, golang
- save_cache:
key: homebrew-linux-v6
key: homebrew-linux-v7
paths:
- /home/linuxbrew
- run:
Expand All @@ -231,14 +231,14 @@ jobs:
- run: sudo mkdir /home/linuxbrew && sudo chown $(id -u) /home/linuxbrew
- restore_cache:
keys:
- homebrew-linux-v6
- homebrew-linux-v7
- attach_workspace:
at: ~/
- run:
command: ./.circleci/linux_circle_vm_setup.sh
name: Circle VM setup - tools, docker, golang
- save_cache:
key: homebrew-linux-v6
key: homebrew-linux-v7
paths:
- /home/linuxbrew
# Now build using the regular ddev-only technique - this results in a fully clean set of executables.
Expand All @@ -261,12 +261,12 @@ jobs:
- run: sudo mkdir /home/linuxbrew && sudo chown $(id -u) /home/linuxbrew
- restore_cache:
keys:
- homebrew-linux-v6
- homebrew-linux-v7
- run:
command: ./.circleci/linux_circle_vm_setup.sh
name: Circle VM setup - tools, docker, golang
- save_cache:
key: homebrew-linux-v6
key: homebrew-linux-v7
paths:
- /home/linuxbrew
- run:
Expand All @@ -282,12 +282,12 @@ jobs:
- run: sudo mkdir /home/linuxbrew && sudo chown $(id -u) /home/linuxbrew
- restore_cache:
keys:
- homebrew-linux-v6
- homebrew-linux-v7
- run:
command: ./.circleci/linux_circle_vm_setup.sh
name: Circle VM setup - tools, docker, golang
- save_cache:
key: homebrew-linux-v6
key: homebrew-linux-v7
paths:
- /home/linuxbrew
- run:
Expand All @@ -305,18 +305,18 @@ jobs:

mac_container_test:
macos:
xcode: "10.2.1"
xcode: "11.0.0"
working_directory: ~/ddev
steps:
- checkout
- restore_cache:
keys:
- homebrew-macos-v11
- homebrew-macos-v12
- run:
command: ./.circleci/macos_circle_vm_setup.sh
name: macOS Circle VM setup - tools, docker, golang
- save_cache:
key: homebrew-macos-v11
key: homebrew-macos-v12
paths:
- /usr/local/Homebrew
- /usr/local/Cellar
Expand All @@ -343,15 +343,15 @@ jobs:
- run: sudo mkdir /home/linuxbrew && sudo chown $(id -u) /home/linuxbrew
- restore_cache:
keys:
- homebrew-linux-v6
- homebrew-linux-v7
- attach_workspace:
at: ~/
- run:
command: ./.circleci/generate_artifacts.sh $ARTIFACTS ${BUILD_IMAGE_TARBALLS:false}
name: tar/zip up artifacts and make hashes
no_output_timeout: "40m"
- save_cache:
key: homebrew-linux-v6
key: homebrew-linux-v7
paths:
- /home/linuxbrew
- store_artifacts:
Expand All @@ -371,12 +371,12 @@ jobs:
- run: sudo mkdir /home/linuxbrew && sudo chown $(id -u) /home/linuxbrew
- restore_cache:
keys:
- homebrew-linux-v6
- homebrew-linux-v7
- run:
command: ./.circleci/linux_circle_vm_setup.sh
name: TAG BUILD Circle VM setup - tools, docker, golang
- save_cache:
key: homebrew-linux-v6
key: homebrew-linux-v7
paths:
- /home/linuxbrew

Expand All @@ -399,7 +399,7 @@ jobs:
# 'release_build' is used to push a full release; it's triggered by api call
release_build:
macos:
xcode: "10.2.1"
xcode: "11.0.0"
working_directory: ~/ddev
environment:
DRUD_DEBUG: "true"
Expand All @@ -408,12 +408,12 @@ jobs:
- checkout
- restore_cache:
keys:
- homebrew-macos-v11
- homebrew-macos-v12
- run:
command: ./.circleci/macos_circle_vm_setup.sh
name: RELEASE BUILD Circle VM setup
- save_cache:
key: homebrew-macos-v11
key: homebrew-macos-v12
paths:
- /usr/local/Homebrew
- /usr/local/Cellar
Expand Down
10 changes: 2 additions & 8 deletions .circleci/macos_circle_vm_setup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,8 @@ nohup /Applications/Docker.app/Contents/MacOS/Docker --unattended &

brew tap drud/ddev

brew install mysql-client zip jq expect coreutils golang ddev mkcert osslsigncode ghr
brew link mysql-client zip jq expect coreutils golang ddev mkcert osslsigncode ghr

# makensis brew install was broken in a recent commit, see
# https://github.com/Homebrew/homebrew-core/pull/39928#issuecomment-520263137
# This uses the former recipe that worked fine.
brew install https://raw.githubusercontent.com/drud/makensis/master/makensis.rb
brew link makensis
brew install mysql-client zip nsis jq expect coreutils golang ddev mkcert osslsigncode ghr
brew link mysql-client zip nsis jq expect coreutils golang ddev mkcert osslsigncode ghr

brew link --force mysql-client

Expand Down

0 comments on commit d07e310

Please sign in to comment.