Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
nktpro committed Feb 4, 2025
1 parent cfc690f commit 930ebf0
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 47 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ defaults:
jobs:
build:
name: Build
runs-on: [ self-hosted, nix, chopsticks, amd64-linux, medium ]
runs-on: [ self-hosted, nix, amd64-linux, medium ]
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -20,6 +20,8 @@ jobs:
echo "PROTOC_CACHE=${XDG_CACHE_HOME}/protoc_cache" >> "${GITHUB_ENV}"
echo "COURSIER_CACHE=${XDG_CACHE_HOME}/coursier" >> "${GITHUB_ENV}"
echo "SBT_OPTS=-Dsbt.global.base=${XDG_CACHE_HOME}/sbt -Dsbt.ivy.home=${XDG_CACHE_HOME}/ivy -Xmx4g -Xss6m -XX:-UseContainerSupport" >> "${GITHUB_ENV}"
echo "FDB_CLUSTER_FILE=$PWD/.fdb/cluster.file" >> "${GITHUB_ENV}"
- name: Check code quality
run: |
Expand All @@ -37,7 +39,11 @@ jobs:
# trap : TERM INT; sleep infinity & wait

- name: Test
run: sbt --client test
run: |
./cli.sh start_ephemeral_fdb_server &
FDBSERVER_PID=$!
trap "kill -9 $FDBSERVER_PID" EXIT
sbt --client test
- name: Publish
if: github.ref == 'refs/heads/master'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ metals.sbt
/.dev-sdks
/.env
/result
/.fdb
61 changes: 30 additions & 31 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 14 additions & 13 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,29 @@
hotPot.url = "github:shopstic/nix-hot-pot";
nixpkgs.follows = "hotPot/nixpkgs";
flakeUtils.follows = "hotPot/flakeUtils";
fdb.follows = "hotPot/fdbPkg";
fdbPkg.follows = "hotPot/fdbPkg";
};

outputs = { self, nixpkgs, flakeUtils, hotPot, fdb }:
outputs = { self, nixpkgs, flakeUtils, hotPot, fdbPkg }:
flakeUtils.lib.eachDefaultSystem
(system:
let
pkgs = import nixpkgs {
inherit system;
overlays = [
(final: prev: {
maven = prev.maven.override {
jdk = prev.jdk11;
};
})
];
# overlays = [
# (final: prev: {
# maven = prev.maven.override {
# jdk = prev.jdk11;
# };
# })
# ];
};
hotPotPkgs = hotPot.packages.${system};
hotPotLib = hotPot.lib.${system};
chopsticksSystem = if system == "aarch64-linux" then "x86_64-linux" else system;
chopsticksPkgs = import nixpkgs { system = chopsticksSystem; };

fdbLib = fdb.packages.${system}.fdb_7.lib;
fdb = fdbPkg.packages.${system}.fdb_7;
fdbLib = fdb.lib;
jdkArgs = [
"--set DYLD_LIBRARY_PATH ${fdbLib}"
"--set LD_LIBRARY_PATH ${fdbLib}"
Expand All @@ -36,7 +37,7 @@
# "--set FDB_NETWORK_OPTION_TRACE_ENABLE /Users/nktpro/Downloads/fdb7"
''--set JDK_JAVA_OPTIONS "-DFDB_LIBRARY_PATH_FDB_JAVA=${fdbLib}/libfdb_java.${if pkgs.stdenv.isDarwin then "jnilib" else "so"}"''
];
jdk = pkgs.callPackage hotPot.lib.wrapJdk {
jdk = pkgs.callPackage hotPotLib.wrapJdk {
jdk = pkgs.jdk11;
args = pkgs.lib.concatStringsSep " " (jdkArgs ++ [''--run "if [[ -f ./.env ]]; then source ./.env; fi"'']);
};
Expand Down Expand Up @@ -86,7 +87,7 @@
'';
buildInputs = builtins.attrValues
{
inherit jdk sbt;
inherit fdb jdk sbt;
inherit (pkgs)
jq
parallel
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ object Dependencies {
)

val lmdbDeps = Seq(
"org.lmdbjava" % "lmdbjava" % "0.8.3"
"org.lmdbjava" % "lmdbjava" % "0.9.0"
)

val fdbDeps = Seq(
Expand Down

0 comments on commit 930ebf0

Please sign in to comment.