From 9cc6f58a38e901a7407bf1a8300c5032940a868b Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 29 Jul 2020 11:11:44 +0200 Subject: [PATCH] set favicon as a root asset --- .circleci/config.yml | 12 ++++++------ apps/remix-ide/.circleci/config.yml | 14 +++++++------- .../ci/deploy_from_travis_remix-alpha.sh | 2 +- apps/remix-ide/{ => src/assets/img}/favicon.ico | Bin apps/remix-ide/src/favicon.ico | Bin 0 -> 15406 bytes workspace.json | 3 ++- 6 files changed, 16 insertions(+), 15 deletions(-) rename apps/remix-ide/{ => src/assets/img}/favicon.ico (100%) create mode 100644 apps/remix-ide/src/favicon.ico diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a41cc91a3..95fdd98ad9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,7 +39,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js" + - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico" working_directory: ~/remix-project parallelism: 20 @@ -84,7 +84,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js" + - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico" working_directory: ~/remix-project parallelism: 20 @@ -127,7 +127,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js" + - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico" working_directory: ~/remix-project steps: @@ -170,7 +170,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js" + - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico" working_directory: ~/remix-project steps: @@ -202,7 +202,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js" + - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico" working_directory: ~/remix-project steps: @@ -227,7 +227,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js" + - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico" working_directory: ~/remix-project steps: diff --git a/apps/remix-ide/.circleci/config.yml b/apps/remix-ide/.circleci/config.yml index 8f98a871ac..2699512199 100644 --- a/apps/remix-ide/.circleci/config.yml +++ b/apps/remix-ide/.circleci/config.yml @@ -17,7 +17,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json" + - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json apps/remix-ide/favicon.ico" working_directory: ~/remix-project parallelism: 20 @@ -59,7 +59,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json" + - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json apps/remix-ide/favicon.ico" working_directory: ~/remix-project parallelism: 20 @@ -99,7 +99,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json" + - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json apps/remix-ide/favicon.ico" working_directory: ~/remix-project steps: @@ -131,7 +131,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json" + - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json apps/remix-ide/favicon.ico" working_directory: ~/remix-project steps: @@ -160,7 +160,7 @@ jobs: environment: - 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" + - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json favicon.ico" working_directory: ~/remix-ide steps: @@ -169,7 +169,7 @@ jobs: - run: npm install - run: npm run build - run: ./ci/build_and_publish_docker_images.sh - + deploy-remix-alpha: docker: # specify the version you desire here @@ -183,7 +183,7 @@ jobs: environment: - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org" - COMMIT_AUTHOR: "Circle CI" - - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json" + - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json apps/remix-ide/favicon.ico" working_directory: ~/remix-project steps: diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh index ca383e1d57..cdfd301afc 100755 --- a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh +++ b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh @@ -14,7 +14,7 @@ echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md cp -r $FILES_TO_PACKAGE "./" rm -rf dist ls -FILES_TO_DEPLOY="assets index.html main.js polyfills.js runtime.js vendor.js" +FILES_TO_DEPLOY="assets index.html main.js polyfills.js runtime.js vendor.js favicon.ico" # ZIP the whole directory zip -r remix-$SHA.zip $FILES_TO_DEPLOY # -f is needed because "build" is part of .gitignore diff --git a/apps/remix-ide/favicon.ico b/apps/remix-ide/src/assets/img/favicon.ico similarity index 100% rename from apps/remix-ide/favicon.ico rename to apps/remix-ide/src/assets/img/favicon.ico diff --git a/apps/remix-ide/src/favicon.ico b/apps/remix-ide/src/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..4f550708f2db2fdd6e319eb31625b2a65249b07a GIT binary patch literal 15406 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 Y&6HR^Lx{Td==oBgVLyw&r#b@v1Iz6V_W%F@ literal 0 HcmV?d00001 diff --git a/workspace.json b/workspace.json index ae01b4f982..fb933f7285 100644 --- a/workspace.json +++ b/workspace.json @@ -17,7 +17,8 @@ "tsConfig": "apps/remix-ide/tsconfig.app.json", "assets": [ "apps/remix-ide/src/assets", - "apps/remix-ide/src/index.html" + "apps/remix-ide/src/index.html", + "apps/remix-ide/src/favicon.ico" ], "styles": [], "scripts": [],