From 77abb1f00d9963ad20ab8b67935a6c351687d98d Mon Sep 17 00:00:00 2001 From: Jacky Nguyen Date: Thu, 11 Apr 2024 14:13:00 -0400 Subject: [PATCH] Update dependencies --- .github/workflows/dev.yaml | 6 -- .../charts/toothpick-master/values.yaml | 2 +- .../charts/toothpick-worker/values.yaml | 2 +- charts/toothpick/values.yaml | 2 +- cli.sh | 9 ++- flake.lock | 76 +++++++++++-------- flake.nix | 9 ++- nix/intellij-scala-runners.nix | 6 +- .../src/test/resources/.toothpick.conf | 2 +- 9 files changed, 65 insertions(+), 49 deletions(-) diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index 687be73..eb94f9c 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -25,8 +25,6 @@ jobs: - nix: aarch64-darwin runner: arm64-darwin size: small - env: - IMAGE_REPOSITORY: public.ecr.aws/shopstic outputs: version: ${{ steps.determine-version.outputs.version }} steps: @@ -87,8 +85,6 @@ jobs: runs-on: [self-hosted, nix, general, arm64-linux, small] timeout-minutes: 5 needs: [build-runner] - env: - IMAGE_REPOSITORY: public.ecr.aws/shopstic steps: - uses: actions/checkout@v4 @@ -108,8 +104,6 @@ jobs: runs-on: [self-hosted, nix, general, arm64-linux, small] timeout-minutes: 5 needs: [build-runner] - env: - IMAGE_REPOSITORY: public.ecr.aws/shopstic steps: - uses: actions/checkout@v4 diff --git a/charts/toothpick/charts/toothpick-master/values.yaml b/charts/toothpick/charts/toothpick-master/values.yaml index 7c9c3b1..e8e8d57 100644 --- a/charts/toothpick/charts/toothpick-master/values.yaml +++ b/charts/toothpick/charts/toothpick-master/values.yaml @@ -1,6 +1,6 @@ global: image: - repository: public.ecr.aws/shopstic/toothpick-server + repository: public.ecr.aws/z8i7w3s6/toothpick-server pullPolicy: IfNotPresent tag: "" diff --git a/charts/toothpick/charts/toothpick-worker/values.yaml b/charts/toothpick/charts/toothpick-worker/values.yaml index cf83de7..80daa68 100644 --- a/charts/toothpick/charts/toothpick-worker/values.yaml +++ b/charts/toothpick/charts/toothpick-worker/values.yaml @@ -2,7 +2,7 @@ replicaCount: 1 global: image: - repository: public.ecr.aws/shopstic/toothpick-server + repository: public.ecr.aws/z8i7w3s6/toothpick-server pullPolicy: IfNotPresent tag: "" diff --git a/charts/toothpick/values.yaml b/charts/toothpick/values.yaml index 56abc44..08235fc 100644 --- a/charts/toothpick/values.yaml +++ b/charts/toothpick/values.yaml @@ -1,6 +1,6 @@ global: image: - repository: public.ecr.aws/shopstic/toothpick-server + repository: public.ecr.aws/z8i7w3s6/toothpick-server pullPolicy: IfNotPresent tag: "" diff --git a/cli.sh b/cli.sh index 7434273..5ffca5d 100755 --- a/cli.sh +++ b/cli.sh @@ -1,9 +1,11 @@ #!/usr/bin/env bash set -euo pipefail -TOOTHPICK_CONFIG="./toothpick-examples/src/test/resources/.toothpick.conf" +DEFAULT_TOOTHPICK_CONFIG="./toothpick-examples/src/test/resources/.toothpick.conf" test_runner_create_stage() { + export TOOTHPICK_CONFIG=${TOOTHPICK_CONFIG:-"${DEFAULT_TOOTHPICK_CONFIG}"} + local TEMP_FILE TEMP_FILE=$(mktemp) trap "rm -Rf ${TEMP_FILE}" EXIT @@ -29,7 +31,8 @@ test_runner_create_stage() { } test_runner_run_stage() { - local STAGE_FILE=${1:?"Stage file is required"} + export TOOTHPICK_CONFIG=${TOOTHPICK_CONFIG:-"${DEFAULT_TOOTHPICK_CONFIG}"} + local TEMP_FILE TEMP_FILE=$(mktemp) trap "rm -Rf ${TEMP_FILE}" EXIT @@ -43,7 +46,7 @@ test_runner_run_stage() { "${RUNNER_CP}" \ "-Dconfig.entry=${TOOTHPICK_CONFIG}" \ dev.toothpick.app.TpConsoleRunnerApp \ - "${STAGE_FILE}" + "$@" } "$@" diff --git a/flake.lock b/flake.lock index 0a63e03..122f487 100644 --- a/flake.lock +++ b/flake.lock @@ -26,16 +26,16 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1706490764, - "narHash": "sha256-yO/29H7r4WsxIoncQzArOsH/6lyyvICiM8c1DL/p1P4=", + "lastModified": 1711820086, + "narHash": "sha256-Se+B9sRpkodURdlSAKSKZubE3N4DsN0QRrue6nBmGkE=", "owner": "shopstic", "repo": "nix-fdb", - "rev": "66373327d9456e70a0ac3522311a11e791f41259", + "rev": "78efd22454350338d451d58b6e119650dab6ebf7", "type": "github" }, "original": { "owner": "shopstic", - "ref": "7.1.53", + "ref": "7.1.57", "repo": "nix-fdb", "type": "github" } @@ -43,7 +43,7 @@ "fdbPkg_3": { "inputs": { "flakeUtils": "flakeUtils_5", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1702180668, @@ -155,11 +155,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -173,11 +173,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -279,15 +279,15 @@ "fdbPkg": "fdbPkg_2", "flakeUtils": "flakeUtils_4", "nix2containerPkg": "nix2containerPkg_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "npmlock2nixPkg": "npmlock2nixPkg_2" }, "locked": { - "lastModified": 1706988406, - "narHash": "sha256-uGBHwQmzt0RGUOYKdrtnN7JKCd5a+4tpseKjXxTboso=", + "lastModified": 1712776150, + "narHash": "sha256-t2CjDJXnG0kZzT4nU87CL7zux4kQDLP6S/PPy8hPSOI=", "owner": "shopstic", "repo": "nix-hot-pot", - "rev": "e7d7daa7c9ca242c0f0fbe318dd135a28e82928e", + "rev": "971c2e4b013b288387cec03b145bbf9b40d96083", "type": "github" }, "original": { @@ -301,7 +301,7 @@ "fdbPkg": "fdbPkg_3", "flakeUtils": "flakeUtils_6", "nix2containerPkg": "nix2containerPkg_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "npmlock2nixPkg": "npmlock2nixPkg_3" }, "locked": { @@ -374,23 +374,20 @@ "nix2containerPkg_2": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": [ - "hotPot", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1701981188, - "narHash": "sha256-oXFdqisYyJ77yDZ3OaAGp+GYUS6e3tWFuavl/AgBdRI=", + "lastModified": 1708764364, + "narHash": "sha256-+pOtDvmuVTg0Gi58hKDUyrNla5NbyUvt3Xs3gLR0Fws=", "owner": "nlewo", "repo": "nix2container", - "rev": "3e84a0a7b94419846acd9c52c4c497c618b2cb7e", + "rev": "c891f90d2e3c48a6b33466c96e4851e0fc0cf455", "type": "github" }, "original": { "owner": "nlewo", "repo": "nix2container", - "rev": "3e84a0a7b94419846acd9c52c4c497c618b2cb7e", + "rev": "c891f90d2e3c48a6b33466c96e4851e0fc0cf455", "type": "github" } }, @@ -452,11 +449,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "lastModified": 1711668574, + "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", "type": "github" }, "original": { @@ -468,11 +465,26 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1706826059, - "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1712437997, + "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920", "type": "github" }, "original": { @@ -482,7 +494,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1701952659, "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=", @@ -498,7 +510,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1705331948, "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", diff --git a/flake.nix b/flake.nix index 829c1ce..1ef2b42 100644 --- a/flake.nix +++ b/flake.nix @@ -112,7 +112,14 @@ "metals.sbtScript" = sbt + "/bin/sbt"; "nix.enableLanguageServer" = true; "nix.formatterPath" = pkgs.nixpkgs-fmt + "/bin/nixpkgs-fmt"; - "nix.serverPath" = pkgs.rnix-lsp + "/bin/rnix-lsp"; + "nix.serverSettings" = { + "nil" = { + "formatting" = { + "command" = [ "nixpkgs-fmt" ]; + }; + }; + }; + "nix.serverPath" = pkgs.nil + "/bin/nil"; }; }; devShell = pkgs.mkShellNoCC { diff --git a/nix/intellij-scala-runners.nix b/nix/intellij-scala-runners.nix index 4cd7732..b3a4c8c 100644 --- a/nix/intellij-scala-runners.nix +++ b/nix/intellij-scala-runners.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip }: stdenv.mkDerivation rec { pname = "intellij-scala-runners"; - version = "2022.1.11"; + version = "2024.1.15"; src = fetchzip { name = "${pname}-${version}"; - url = "https://plugins.jetbrains.com/files/1347/166693/scala-intellij-bin-${version}.zip"; - sha256 = "sha256-ExlENrcITS0LJJSu4H+d0JxunW5zdi285mVPZhCjbEw="; + url = "https://plugins.jetbrains.com/files/1347/516275/scala-intellij-bin-${version}.zip"; + sha256 = "sha256-2g1pKR5F/K2KPzdTZolYp58REgLvbf606OkEB4l03L4="; }; installPhase = '' diff --git a/toothpick-examples/src/test/resources/.toothpick.conf b/toothpick-examples/src/test/resources/.toothpick.conf index 5b14b16..4afde5b 100644 --- a/toothpick-examples/src/test/resources/.toothpick.conf +++ b/toothpick-examples/src/test/resources/.toothpick.conf @@ -9,7 +9,7 @@ app { test-per-process-file-name-regex = ".*" containerizer { base-image { - name = "public.ecr.aws/shopstic/jre-fdb-test-base:17.0.4_8-7.1.21@sha256:0aacddb39e8e376f6ded603e5c2d6827e6b72146996839881886b109600eda4e" + name = "public.ecr.aws/z8i7w3s6/jre-fdb-test-base:17.0.7_7-7.1.57@sha256:2fe2270908a20f1f78bc849be7e910d7b68237971b03a2be0f3975466f4e3821" credentials { registry = "public.ecr.aws" docker-config-file = ${HOME}"/.docker/config.json"