From 188c83a072d877ef4033a2838c10d467e014134f Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Thu, 14 Apr 2022 15:20:30 -0500 Subject: [PATCH] Update references to "compiler_unshaded" that almost certainly want shaded --- .github/ci_support/test_closure-compiler-npm.sh | 2 +- .github/workflows/ci.yaml | 6 +++--- README.md | 4 ++-- package.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ci_support/test_closure-compiler-npm.sh b/.github/ci_support/test_closure-compiler-npm.sh index d4dbcc75346..6cdde1ba681 100755 --- a/.github/ci_support/test_closure-compiler-npm.sh +++ b/.github/ci_support/test_closure-compiler-npm.sh @@ -20,7 +20,7 @@ # - PWD = closure-compiler-npm repo root # # Params: -# 1. File name of compiler_unshaded_deploy.jar +# 1. File name of compiler_shaded.jar function main() { local compiler_jar="$1" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1869fd28e06..1557fcdab8e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -59,7 +59,7 @@ jobs: # upload-artifact doesn't support paths with symlinks run: | mkdir -p ${{ env.UNSYMLINK_DIR }} - cp -t ${{ env.UNSYMLINK_DIR }} bazel-bin/compiler_unshaded_deploy.jar + cp -t ${{ env.UNSYMLINK_DIR }} bazel-bin/compiler_shaded.jar cp -t ${{ env.UNSYMLINK_DIR }} bazel-bin/*_bundle.jar # Share the following files with other jobs in this workflow. They can be grabbed using ID @@ -70,7 +70,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: unshaded_compiler - path: ${{ env.UNSYMLINK_DIR }}/compiler_unshaded_deploy.jar + path: ${{ env.UNSYMLINK_DIR }}/compiler_shaded.jar if-no-files-found: error # If this build will be uploadaded as a SNAPSHOT, share the Sonatype bundles with the other @@ -124,7 +124,7 @@ jobs: path: compiler/bazel-bin - name: Test closure-compiler-npm - run: compiler/.github/ci_support/test_closure-compiler-npm.sh compiler/bazel-bin/compiler_unshaded_deploy.jar + run: compiler/.github/ci_support/test_closure-compiler-npm.sh compiler/bazel-bin/compiler_shaded.jar deploy-snapshots: name: Deploy Snapshot Bundles to Sonatype diff --git a/README.md b/README.md index d93ad860915..73cc07e65e0 100644 --- a/README.md +++ b/README.md @@ -235,7 +235,7 @@ You can trigger the build process easily with package.json scripts or by calling Bazel manually. ```bash -# bazelisk build //:compiler_unshaded_deploy.jar +# bazelisk build //:compiler_shaded.jar yarn build # bazelisk build :all @@ -270,7 +270,7 @@ directory. You can access it with a call to `java -jar ...` or by using the package.json script: ```bash -# java -jar bazel-bin/compiler_unshaded_deploy.jar [...args] +# java -jar bazel-bin/compiler_shaded.jar [...args] yarn compile [...args] ``` diff --git a/package.json b/package.json index 607c6bc5e4f..04e2e19366f 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "build": "clean && mvn -DskipTests", "build:fast": "mvn -DskipTests -pl externs/pom.xml,pom-main.xml,pom-main-shaded.xml", "clean": "yarn runtime_tests:clean && mvn clean", - "compile": "java -jar bazel-bin/compiler_unshaded_deploy.jar", + "compile": "java -jar bazel-bin/compiler_shaded.jar", "runtime_tests:build": "$npm_package_config_runtime_tests_dir/utils/build.sh", "runtime_tests:clean": "rm -rf $npm_package_config_runtime_tests_dir/**/build/*", "runtime_tests:run": "jest --testRegex $npm_package_config_runtime_tests_dir/utils/test/* --verbose=true",