diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index fe9b70d..545a990 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -32,6 +32,12 @@ jobs: run: | ./gradlew :build + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + # Log in to GitHub Container Registry - name: Log in to GitHub Container Registry uses: docker/login-action@v3 @@ -46,6 +52,7 @@ jobs: with: context: . push: true + platforms: linux/amd64,linux/arm64 tags: | ghcr.io/kleis-technology/cloud-assess/cloud-assess-app:${{ github.ref_name }} ghcr.io/kleis-technology/cloud-assess/cloud-assess-app:latest diff --git a/build.gradle.kts b/build.gradle.kts index 4ee56ed..4e00c24 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,7 +30,7 @@ repositories { } dependencies { - val lcaacVersion = "1.7.11" + val lcaacVersion = "1.7.12" implementation("ch.kleis.lcaac:core:$lcaacVersion") implementation("ch.kleis.lcaac:grammar:$lcaacVersion") diff --git a/flake.lock b/flake.lock index 8b64ce1..6428eea 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "lcaac-flake": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1748014499, + "narHash": "sha256-1IxbHf7b/5j0UGFyDt38+zST8sLiJlsg45Q1kwX6lGA=", + "owner": "kleis-technology", + "repo": "homebrew-lcaac", + "rev": "a1a34c96726a117d985a54616c93b21d0b65ab8e", + "type": "github" + }, + "original": { + "owner": "kleis-technology", + "repo": "homebrew-lcaac", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 0, @@ -12,9 +30,22 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 0, + "narHash": "sha256-v2NB8B3EahTvJ0Zg6QVJVUjq2cBwZ0UKTwMr2nv9718=", + "path": "/nix/store/hpyq11kyx19ggxi78ryhhhc9ai9p7jxp-source", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "root": { "inputs": { - "nixpkgs": "nixpkgs" + "lcaac-flake": "lcaac-flake", + "nixpkgs": "nixpkgs_2" } } }, diff --git a/flake.nix b/flake.nix index f17282f..9bbf10e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,9 @@ { description = "Cloud Assess flake"; - outputs = inputs@{ nixpkgs, ...}: + inputs.lcaac-flake = { + url = "github:kleis-technology/homebrew-lcaac"; + }; + outputs = inputs@{ nixpkgs, lcaac-flake, ...}: { devShells = { aarch64-darwin.default = @@ -12,6 +15,7 @@ packages = with pkgs; [ jdk23 gradle + lcaac-flake.packages.aarch64-darwin.lcaac-cli ]; }; }; diff --git a/trusted_library/.gitignore b/trusted_library/.gitignore index 81ec2b6..bfbca9c 100644 --- a/trusted_library/.gitignore +++ b/trusted_library/.gitignore @@ -1 +1,2 @@ lcaac-tmp.yaml +test-data