diff --git a/.circleci/config.yml b/.circleci/config.yml index 659ff80155..796b5c6c74 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,10 +14,7 @@ jobs: # documented at https://circleci.com/docs/2.0/circleci-images/ # - image: circleci/mongo:3.4.4 environment: - - ENCRYPTION_LABEL1: "b5c2730599da" - - ENCRYPTION_LABEL2: "85f76a180658" - - ENCRYPTION_LABEL3: "1b1c118ea62d" - - COMMIT_AUTHOR_EMAIL: "chris@ethereum.org" + - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json" working_directory: ~/repo @@ -41,6 +38,7 @@ jobs: command: java -jar selenium-server-standalone-3.5.3.jar background: true - run: ./ci/browser_tests.sh + - run: if [ $CIRCLE_BRANCH == 'master' ]; then ./ci/deploy_from_travis_remix-alpha.sh fi workflows: version: 2 diff --git a/ci/deploy_from_travis_remix-alpha.sh b/ci/deploy_from_travis_remix-alpha.sh index 89897cfe17..43d7f2548d 100755 --- a/ci/deploy_from_travis_remix-alpha.sh +++ b/ci/deploy_from_travis_remix-alpha.sh @@ -17,18 +17,4 @@ zip -r remix-$SHA.zip $FILES_TO_PACKAGE git add -f $FILES_TO_PACKAGE remix-$SHA.zip git commit -m "Built website from {$SHA}." -ENCRYPTED_KEY_VAR3="encrypted_${ENCRYPTION_LABEL3}_key" -ENCRYPTED_IV_VAR3="encrypted_${ENCRYPTION_LABEL3}_iv" -ENCRYPTED_KEY3=${!ENCRYPTED_KEY_VAR3} -ENCRYPTED_IV3=${!ENCRYPTED_IV_VAR3} - -touch deploy_key_remix-live-alpha -chmod 600 deploy_key_remix-live-alpha -openssl aes-256-cbc -K $ENCRYPTED_KEY3 -iv $ENCRYPTED_IV3 -in ci/deploy_key_remix-live-alpha.enc -out deploy_key_remix-live-alpha -d -eval `ssh-agent -s` - - - - -ssh-add deploy_key_remix-live-alpha git push -f git@github.com:ethereum/remix-live-alpha.git gh-pages diff --git a/ci/deploy_from_travis_remix-live.sh b/ci/deploy_from_travis_remix-live.sh index 1636e0b497..b64bec18b3 100755 --- a/ci/deploy_from_travis_remix-live.sh +++ b/ci/deploy_from_travis_remix-live.sh @@ -17,16 +17,4 @@ zip -r remix-$SHA.zip $FILES_TO_PACKAGE git add -f $FILES_TO_PACKAGE remix-$SHA.zip git commit -m "Built website from {$SHA}." -ENCRYPTED_KEY_VAR2="encrypted_${ENCRYPTION_LABEL2}_key" -ENCRYPTED_IV_VAR2="encrypted_${ENCRYPTION_LABEL2}_iv" -ENCRYPTED_KEY2=${!ENCRYPTED_KEY_VAR2} -ENCRYPTED_IV2=${!ENCRYPTED_IV_VAR2} - -touch deploy_key_remix-live -chmod 600 deploy_key_remix-live -openssl aes-256-cbc -K $ENCRYPTED_KEY2 -iv $ENCRYPTED_IV2 -in ci/deploy_key_remix-live.enc -out deploy_key_remix-live -d -eval `ssh-agent -s` - -git commit --amend -m "Built website from {$SHA}." -ssh-add deploy_key_remix-live git push -f git@github.com:ethereum/remix-live.git gh-pages