Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge ianoc with master #321

Merged
merged 28 commits into from
Feb 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9a4d3e6
Add new entries to git ignore
ianoc Mar 4, 2022
877a722
Update to new format
ianoc Mar 5, 2022
feb117e
Fix
ianoc Mar 5, 2022
287e1f0
Fix some bugs
ianoc Mar 5, 2022
38f763f
Fix dependency
ianoc Apr 14, 2022
d01b062
Implements Maven URL when resolving artifacts
tlazaro Apr 21, 2022
738c74b
Merge pull request #1 from tlazaro/tlazaro/coursier-maven-url
ianoc Apr 21, 2022
b8e1794
Rename the jar
ianoc Apr 21, 2022
9e0b6e8
Fix the edge cutting code
ianoc Apr 22, 2022
da77025
Fix printing
ianoc Apr 22, 2022
7648910
Ensure no double slashes
ianoc Apr 22, 2022
cbb6fe9
Select for the place we found the jar
ianoc Apr 22, 2022
e0aae8b
Formatting, alas mixed in with removing writing build files for 3rdpa…
ianoc Jun 15, 2022
68d90d3
Compiles
ianoc Jun 15, 2022
d937420
Just emit a json of all the outputs
ianoc Jun 16, 2022
a25f9b1
fix
ianoc Jun 16, 2022
dd012d7
Handle replacements
ianoc Jun 16, 2022
fd4a295
Cleanup some tests and more options
ianoc Jun 17, 2022
24b3083
pass out the file sizes of jars in the metadata, so we can construct …
ianoc Jul 28, 2022
f313ff7
ADd more info to error
ianoc Aug 18, 2022
a9f435f
Fix bug
ianoc Aug 18, 2022
2104a87
Consume the manual deps
ianoc Sep 20, 2022
da676a8
Fix some issues around classifiers
ianoc Sep 20, 2022
3247241
Merge modules more sanely
ianoc Sep 21, 2022
24bdb3f
Optionally compress the output
ianoc Sep 23, 2022
2db9e9f
Fix bug, these are reverse dependencies so we can't prune like this
ianoc Jan 20, 2023
0789aa8
use old ubuntu
ianoc Jan 20, 2023
9c7d21c
merge Ian's changes with master
Feb 28, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest, ubuntu-latest]
os: [macos-latest, ubuntu-18.04]
include:
- os: macos-latest
graal_url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.0.0/graalvm-ce-java11-darwin-amd64-20.0.0.tar.gz
artifact: bazel-deps-macos
bazel_installer_sha: b4c94148f52854b89cff5de38a9eeeb4b0bcb3fb3a027330c46c468d9ea0898b
bazel_version: 2.1.1
- os: ubuntu-latest
- os: ubuntu-18.04
graal_url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.0.0/graalvm-ce-java11-linux-amd64-20.0.0.tar.gz
artifact: bazel-deps-linux
bazel_installer_sha: d6cea18d59e9c90c7ec417b2645834f968132de16d0022c7439b1e60438eb8c9
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
make_release:
name: Make release
needs: native-image
runs-on: ubuntu-latest
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Download linux bazel-deps
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ bazel-*
.project/**
.ijwb
/templates
.metals
.vscode
12 changes: 12 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:git.bzl",
"git_repository", "new_git_repository")


http_archive(
name = "zlib",
build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
strip_prefix = "zlib-1.2.11",
urls = [
"https://mirror.bazel.build/zlib.net/zlib-1.2.11.tar.gz",
"https://zlib.net/zlib-1.2.11.tar.gz",
],
)

git_repository(
name = "io_bazel_rules_scala",
remote = "https://github.com/bazelbuild/rules_scala",
Expand Down
2 changes: 1 addition & 1 deletion ci_scripts/make_native_artifact.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ native-image -H:+ReportUnsupportedElementsAtRuntime \
rm -rf native_image_working_directory

# ensure it actually works!
./bazel-deps generate --repo-root `pwd` --sha-file 3rdparty/workspace.bzl --deps dependencies.yaml --target-file 3rdparty/target_file.bzl --disable-3rdparty-in-repo
./bazel-deps generate --repo-root `pwd` --resolved-output 3rdparty/resolved-deps.json --deps dependencies.yaml
Loading