cp

bazeltools · Mar 1, 2020 · 6e96852 · 6e96852
1 parent cbaed98
commit 6e96852
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 46 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -50,46 +50,46 @@ jobs:
           BAZEL_VERSION: ${{ matrix.bazel_version }}
           BAZEL_INSTALLER_SHA: ${{ matrix.bazel_installer_sha }}
           BAZEL_BIN_LOC: "${{ github.workspace }}/.bazel-cache/bazel-bin"
-  #     - uses: olafurpg/setup-scala@v5
-  #     - run: jabba install graal-custom@20.0=tgz+${{ matrix.graal_url }}
-  #     - name: Make native image
-  #       run: ./ci_scripts/make_native_artifact.sh  ${{ matrix.graal_url }}
-  #     - uses: actions/upload-artifact@master
-  #       with:
-  #         name: ${{ matrix.artifact }}
-  #         path: bazel-deps
-  # make_release:
-  #   name: Display results
-  #   needs: native-image
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Download linux bazel-deps
-  #       uses: actions/download-artifact@v1
-  #       with:
-  #         name: bazel-deps-linux
-  #         path: downloads/bazel-deps-linux
-  #     - name: Download linux bazel-deps
-  #       uses: actions/download-artifact@v1
-  #       with:
-  #         name: bazel-deps-macos
-  #         path: downloads/bazel-deps-macos
-  #     - name: Look at localA
-  #       run: ls -lR
-  #     - name: mv binaries linux
-  #       run: mv downloads/bazel-deps-linux/bazel-deps bazel-deps-linux
-  #     - name: mv binaries macos
-  #       run: mv downloads/bazel-deps-macos/bazel-deps bazel-deps-macos
-  #     - name: Look at local
-  #       run: ls -lR
-  #     - name: Look at macos
-  #       run: cat bazel-deps-macos
-  #     - uses: "marvinpinto/action-automatic-releases@latest"
-  #       with:
-  #         repo_token: "${{ secrets.GITHUB_TOKEN }}"
-  #         automatic_release_tag: "v0.1-${{ github.run_number }}"
-  #         prerelease: false
-  #         title: "Auto generated release"
-  #         files: |
-  #           bazel-deps-macos
-  #           bazel-deps-linux
-  #       id: "automatic_releases"
+      - uses: olafurpg/setup-scala@v5
+      - run: jabba install graal-custom@20.0=tgz+${{ matrix.graal_url }}
+      - name: Make native image
+        run: ./ci_scripts/make_native_artifact.sh  ${{ matrix.graal_url }}
+      - uses: actions/upload-artifact@master
+        with:
+          name: ${{ matrix.artifact }}
+          path: bazel-deps
+  make_release:
+    name: Display results
+    needs: native-image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download linux bazel-deps
+        uses: actions/download-artifact@v1
+        with:
+          name: bazel-deps-linux
+          path: downloads/bazel-deps-linux
+      - name: Download linux bazel-deps
+        uses: actions/download-artifact@v1
+        with:
+          name: bazel-deps-macos
+          path: downloads/bazel-deps-macos
+      - name: Look at localA
+        run: ls -lR
+      - name: mv binaries linux
+        run: mv downloads/bazel-deps-linux/bazel-deps bazel-deps-linux
+      - name: mv binaries macos
+        run: mv downloads/bazel-deps-macos/bazel-deps bazel-deps-macos
+      - name: Look at local
+        run: ls -lR
+      - name: Look at macos
+        run: cat bazel-deps-macos
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "v0.1-${{ github.run_number }}"
+          prerelease: false
+          title: "Auto generated release"
+          files: |
+            bazel-deps-macos
+            bazel-deps-linux
+        id: "automatic_releases"
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ bazel-*
 .DS_Store
 .project/**
 .ijwb
+/templates
diff --git a/ci_scripts/make_native_artifact.sh b/ci_scripts/make_native_artifact.sh
@@ -8,7 +8,11 @@ gu install native-image
 
 cd $GITHUB_WORKSPACE
 
-~/github/graalvm-ce-19.0.2/Contents/Home/bin/native-image -H:+ReportUnsupportedElementsAtRuntime \
+rm -rf templates
+mkdir templates/
+cp src/scala/com/github/johnynek/bazel_deps/templates/* templates/
+
+native-image -H:+ReportUnsupportedElementsAtRuntime \
  --initialize-at-build-time \
  --no-server \
  --enable-http \
@@ -20,7 +24,7 @@ cd $GITHUB_WORKSPACE
  --allow-incomplete-classpath \
  -H:+ReportExceptionStackTraces \
  --no-fallback \
- -H:IncludeResources='src.*/templates.*bzl$' \
+ -H:IncludeResources='templates/.*bzl$' \
  -jar bazel-deps.jar
 
 # ensure it actually works!

diff --git a/src/scala/com/github/johnynek/bazel_deps/Writer.scala b/src/scala/com/github/johnynek/bazel_deps/Writer.scala
@@ -11,7 +11,7 @@ import scala.util.{Failure, Success}
 
 object Writer {
   private lazy val jarArtifactBackend = Source.fromInputStream(
-    getClass.getResourceAsStream("/templates/jar_artifact_backend.bzl")).mkString
+        getClass.getResourceAsStream("/templates/jar_artifact_backend.bzl")).mkString
 
 
   private lazy val externalWorkspaceBackend = Source.fromInputStream(