Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 7 additions & 11 deletions .github/workflows/trybot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ jobs:
matrix:
go-version:
- stable
runner:
- namespace-profile-linux-amd64
- ns-macos-arm64
include:
- runner: namespace-profile-linux-amd64
binary: linux-amd64
- runner: ns-macos-arm64
binary: darwin-arm64
runs-on: ${{ matrix.runner }}
if: |-
(contains(github.event.head_commit.message, '
Expand Down Expand Up @@ -101,17 +103,11 @@ jobs:
path: libcue
- name: Build libcue
working-directory: libcue
run: |-
go build -o libcue.so -buildmode=c-shared
cp libcue.so libcue.dylib
cp libcue.so cue.dll
run: go build -o ../src/main/resources/${{ matrix.binary }} -buildmode=c-shared
- name: Early git and code sanity checks
run: go run cuelang.org/go/internal/ci/checks@v0.14.1
- name: Test
env:
LD_LIBRARY_PATH: ${{ github.workspace }}/libcue
DYLD_LIBRARY_PATH: ${{ github.workspace }}/libcue
run: mvn clean install package
run: ./mvnw clean install package
- name: go generate
run: go generate ./...
- if: always()
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,8 @@ buildNumber.properties
*.zip
*.tar.gz
*.rar

/.idea/

/src/main/resources/darwin-arm64
/src/main/resources/linux-amd64
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/dictionaries/aram.xml

This file was deleted.

20 changes: 0 additions & 20 deletions .idea/jarRepositories.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/misc.xml

This file was deleted.

124 changes: 0 additions & 124 deletions .idea/uiDesigner.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

3 changes: 3 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-5/apache-maven-4.0.0-rc-5-bin.zip

This file was deleted.

2 changes: 1 addition & 1 deletion gen
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ fi
: ${LIBCUE:=$HOME/src/libcue}

rm -rf src/main/java/org/cuelang/libcue
jextract -t org.cuelang.libcue --output src/main/java -lcue --use-system-load-library @includes.txt "$LIBCUE/cue.h"
jextract -t org.cuelang.libcue --output src/main/java --use-system-load-library @includes.txt "$LIBCUE/cue.h"
4 changes: 4 additions & 0 deletions includes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@
--include-function cue_errors_as_values
--include-function cue_error_string
--include-function cue_filename
--include-function cue_fields
--include-function cue_final
--include-function cue_free
--include-function cue_free_all
--include-function cue_from_bool
--include-function cue_from_bytes
--include-function cue_from_double
--include-function cue_from_int64
--include-function cue_from_list
--include-function cue_from_string
--include-function cue_from_uint64
--include-function cue_hidden
Expand All @@ -55,9 +57,11 @@
--include-function cue_inline_imports
--include-function cue_instance_of
--include-function cue_is_equal
--include-function cue_list
--include-function cue_lookup_string
--include-function cue_newctx
--include-function cue_optionals
--include-function cue_path
--include-function cue_raw
--include-function cue_schema
--include-function cue_scope
Expand Down
15 changes: 6 additions & 9 deletions internal/ci/github/trybot.cue
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ workflows: trybot: _repo.bashWorkflow & {
"go-version": ["stable"]

// TODO: Windows is missing because of issue #3016.
runner: [_repo.linuxMachine, _repo.macosMachine]
include: [
{runner: _repo.linuxMachine, binary: "linux-amd64"},
{runner: _repo.macosMachine, binary: "darwin-arm64"},
]
}
}

Expand Down Expand Up @@ -105,18 +108,12 @@ workflows: trybot: _repo.bashWorkflow & {
// The name of the shared library is target-dependent.
// Build libcue with all possible names so we're covered
// in all cases.
run: """
go build -o libcue.so -buildmode=c-shared
cp libcue.so libcue.dylib
cp libcue.so cue.dll
"""
run: "go build -o ../src/main/resources/${{ matrix.binary }} -buildmode=c-shared"
}

_mavenTest: githubactions.#Step & {
name: "Test"
env: LD_LIBRARY_PATH: "${{ github.workspace }}/libcue"
env: DYLD_LIBRARY_PATH: "${{ github.workspace }}/libcue"
run: "mvn clean install package"
run: "./mvnw clean install package"
}

_goGenerate: githubactions.#Step & {
Expand Down
Loading