Skip to content

Commit d9c6424

Browse files
committed
Update for 2023
1 parent bdcd0b0 commit d9c6424

File tree

4 files changed

+54
-4
lines changed

4 files changed

+54
-4
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
id "edu.wpi.first.GradleRIO" version "2023.1.1"
77
}
88

9-
version = "23.0.1-SNAPSHOT"
9+
version = "23.0.0"
1010

1111
sourceCompatibility = JavaVersion.VERSION_11
1212
targetCompatibility = JavaVersion.VERSION_11

flake.lock

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
description = "Dev shell for robot";
3+
4+
inputs =
5+
{
6+
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
7+
};
8+
9+
outputs = { self, nixpkgs }:
10+
let
11+
pkgs = nixpkgs.legacyPackages.aarch64-darwin;
12+
pkgs-x86 = nixpkgs.legacyPackages.x86_64-darwin;
13+
in
14+
{
15+
16+
devShells.aarch64-darwin.default = pkgs.mkShell {
17+
nativeBuildInputs = with pkgs; [
18+
jdk17_headless
19+
];
20+
};
21+
22+
};
23+
}

installer/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ rm -rf $STAGE_DIR
1111
mkdir -p $STAGE_DIR/usr/local/lib
1212
mkdir -p $STAGE_DIR/usr/local/bin
1313

14-
cp -c $TCT_DIR/build/libs/tct-$VERSION.jar $STAGE_DIR/usr/local/lib/tct.jar
15-
cp -c $TCT_DIR/script/tct $STAGE_DIR/usr/local/bin/tct
14+
cp $TCT_DIR/build/libs/tct-$VERSION.jar $STAGE_DIR/usr/local/lib/tct.jar
15+
cp $TCT_DIR/script/tct $STAGE_DIR/usr/local/bin/tct
1616

1717
# tar staged files
1818
rm -rf $PAYLOAD_DIR
@@ -29,7 +29,7 @@ echo ""
2929
END
3030

3131
chmod +x $PAYLOAD_DIR/installer
32-
tar -C $PAYLOAD_DIR --options "gzip:compression-level=9" -c -z -f payload.tgz files.tar installer
32+
tar -C $PAYLOAD_DIR -c -z -f payload.tgz files.tar installer
3333

3434
# tar and compress payload
3535
cat <<'DECOMPRESS_END' > $INSTALLER

0 commit comments

Comments
 (0)