From b46fcdfe728558732f757dc2ead4512485b768ba Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Thu, 23 Nov 2017 12:19:55 +0200 Subject: [build] Added CircleCI macos-release-node{4,6} jobs --- circle.yml | 81 ++++++++++++++++++++++++++++++++--- platform/node/bitrise.yml | 69 +++-------------------------- platform/node/scripts/after_script.sh | 14 ------ 3 files changed, 81 insertions(+), 83 deletions(-) delete mode 100755 platform/node/scripts/after_script.sh diff --git a/circle.yml b/circle.yml index b9107d5416..136e1ce5e6 100644 --- a/circle.yml +++ b/circle.yml @@ -35,6 +35,14 @@ workflows: - ios-sanitize-thread - macos-debug - macos-debug-qt5 + - macos-release-node4: + filters: + tags: + only: /node-.*/ + - macos-release-node6: + filters: + tags: + only: /node-.*/ step-library: - &generate-cache-key @@ -125,6 +133,20 @@ step-library: brew install cmake brew install ccache + - &install-macos-node4-dependencies + run: + name: Install macOS Node@4 dependencies + command: | + brew install node@4 + brew link node@4 --force --overwrite + + - &install-macos-node6-dependencies + run: + name: Install macOS Node@6 dependencies + command: | + brew install node@6 + brew link node@6 --force --overwrite + - &install-macos-qt-dependencies run: name: Install macOS Qt dependencies @@ -138,18 +160,25 @@ step-library: ln -s $HOMEBREW_QT5_CELLAR/$HOMEBREW_QT5_VERSION/mkspecs /usr/local/mkspecs ln -s $HOMEBREW_QT5_CELLAR/$HOMEBREW_QT5_VERSION/plugins /usr/local/plugins - - &run-node-tests + - &run-node-macos-tests + run: + name: Run node tests + command: make test-node + + - &run-node-linux-tests run: name: Run node tests command: | xvfb-run --server-args="-screen 0 1024x768x24" \ logbt -- apitrace trace --api=egl -v make test-node - - &run-node-tests-recycle-map + + - &run-node-linux-tests-recycle-map run: name: Run node tests (recycling the map object) command: | xvfb-run --server-args="-screen 0 1024x768x24" \ logbt -- apitrace trace --api=egl -v make test-node-recycle-map + - &run-unit-tests run: name: Run tests @@ -355,7 +384,7 @@ jobs: - *build-node - *show-ccache-stats - *save-cache - - *run-node-tests + - *run-node-linux-tests - *publish-node-package - *upload-render-tests @@ -378,7 +407,7 @@ jobs: - *build-node - *show-ccache-stats - *save-cache - - *run-node-tests + - *run-node-linux-tests - *publish-node-package - *upload-render-tests @@ -401,7 +430,7 @@ jobs: - *build-node - *show-ccache-stats - *save-cache - - *run-node-tests-recycle-map + - *run-node-linux-tests-recycle-map - *publish-node-package - *upload-render-tests-recycle-map @@ -730,3 +759,45 @@ jobs: - store_artifacts: path: test/fixtures destination: test/fixtures + +# ------------------------------------------------------------------------------ + macos-release-node4: + macos: + xcode: "9.0" + environment: + BUILDTYPE: RelWithDebInfo + HOMEBREW_NO_AUTO_UPDATE: 1 + steps: + - checkout + - *install-macos-dependencies + - *install-macos-node4-dependencies + - *generate-cache-key + - *restore-cache + - *reset-ccache-stats + - *build-node + - *show-ccache-stats + - *save-cache + - *run-node-macos-tests + - *publish-node-package + - *upload-render-tests + +# ------------------------------------------------------------------------------ + macos-release-node6: + macos: + xcode: "9.0" + environment: + BUILDTYPE: RelWithDebInfo + HOMEBREW_NO_AUTO_UPDATE: 1 + steps: + - checkout + - *install-macos-dependencies + - *install-macos-node6-dependencies + - *generate-cache-key + - *restore-cache + - *reset-ccache-stats + - *build-node + - *show-ccache-stats + - *save-cache + - *run-node-macos-tests + - *publish-node-package + - *upload-render-tests diff --git a/platform/node/bitrise.yml b/platform/node/bitrise.yml index fab3093d6e..4a013ea8b0 100644 --- a/platform/node/bitrise.yml +++ b/platform/node/bitrise.yml @@ -1,74 +1,15 @@ -format_version: 1.3.0 +format_version: 1.1.0 default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git trigger_map: -- tag: "node-v*" - workflow: publish -- push_branch: "*" +- pattern: "*" + is_pull_request_allowed: true workflow: primary -- pull_request_target_branch: "*" - workflow: primary - -shortcuts: - slack: &slack - title: Post to Slack - inputs: - - webhook_url: "$SLACK_HOOK_URL" - - channel: "#gl-bots" - - from_username: 'Bitrise Node macOS' - - from_username_on_error: 'Bitrise Node macOS' - - message: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}> - for - by ${GIT_CLONE_COMMIT_COMMITER_NAME} - passed' - - message_on_error: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}> - for - by ${GIT_CLONE_COMMIT_COMMITER_NAME} - failed' - - icon_url: https://bitrise-public-content-production.s3.amazonaws.com/slack/bitrise-slack-icon-128.png - - icon_url_on_error: https://bitrise-public-content-production.s3.amazonaws.com/slack/bitrise-slack-error-icon-128.png workflows: primary: steps: - script: - title: Test - inputs: - - content: |- - #!/bin/bash - set -eu -o pipefail - brew update - brew unlink node - brew install cmake awscli node@4 node@6 - brew link node@4 --force - gem install xcpretty --no-rdoc --no-ri - make test-node || RESULT=$? - brew unlink node@4 - brew link --overwrite node@6 --force - make clean - make test-node || RESULT=$? - ./platform/node/scripts/after_script.sh ${BITRISE_BUILD_NUMBER} - exit ${RESULT:-0} - - slack: *slack - - publish: - steps: - - script: - title: Publish + title: Skip Workflow inputs: - - content: |- - #!/bin/bash - set -eu -o pipefail - brew update - brew unlink node - brew install cmake awscli node@4 node@6 - brew link node@4 --force - gem install xcpretty --no-rdoc --no-ri - export BUILDTYPE=RelWithDebInfo - export PUBLISH=true - make test-node && ./platform/node/scripts/after_success.sh - brew unlink node@4 - brew link --overwrite node@6 --force - make clean - make test-node && ./platform/node/scripts/after_success.sh - - slack: *slack + - content: echo "This workflow is obsolete — see CircleCi." diff --git a/platform/node/scripts/after_script.sh b/platform/node/scripts/after_script.sh deleted file mode 100755 index beb8d6966f..0000000000 --- a/platform/node/scripts/after_script.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -e -set -o pipefail - -JOB=$1 - -if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then - gzip --stdout mapbox-gl-js/test/integration/render-tests/index.html | \ - aws s3 cp --acl public-read --content-encoding gzip --content-type text/html \ - - s3://mapbox/mapbox-gl-native/render-tests/$JOB/index.html - - echo http://mapbox.s3.amazonaws.com/mapbox-gl-native/render-tests/$JOB/index.html -fi -- cgit v1.2.1