Skip to content

Commit

Permalink
Trying my proposed fix, absent any feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
niloc132 committed May 5, 2022
1 parent 188c83a commit 97e6a4d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/ci_support/test_closure-compiler-npm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# - PWD = closure-compiler-npm repo root
#
# Params:
# 1. File name of compiler_shaded.jar
# 1. File name of compiler_uberjar_deploy.jar
function main() {
local compiler_jar="$1"

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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_shaded.jar
cp -t ${{ env.UNSYMLINK_DIR }} bazel-bin/compiler_uberjar_deploy.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
Expand All @@ -70,7 +70,7 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: unshaded_compiler
path: ${{ env.UNSYMLINK_DIR }}/compiler_shaded.jar
path: ${{ env.UNSYMLINK_DIR }}/compiler_uberjar_deploy.jar
if-no-files-found: error

# If this build will be uploadaded as a SNAPSHOT, share the Sonatype bundles with the other
Expand Down Expand Up @@ -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_shaded.jar
run: compiler/.github/ci_support/test_closure-compiler-npm.sh compiler/bazel-bin/compiler_uberjar_deploy.jar

deploy-snapshots:
name: Deploy Snapshot Bundles to Sonatype
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ You can trigger the build process easily with package.json scripts or by calling
Bazel manually.

```bash
# bazelisk build //:compiler_shaded.jar
# bazelisk build //:compiler_uberjar_deploy.jar
yarn build

# bazelisk build :all
Expand Down Expand Up @@ -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_shaded.jar [...args]
# java -jar bazel-bin/compiler_uberjar_deploy.jar [...args]
yarn compile [...args]
```

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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_shaded.jar",
"compile": "java -jar bazel-bin/compiler_uberjar_deploy.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",
Expand Down

0 comments on commit 97e6a4d

Please sign in to comment.