Bump deps, CI cleanup

maplibre · Jul 12, 2024 · adb9a4a · adb9a4a
1 parent cf5d00d
commit adb9a4a
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 56 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -10,7 +10,10 @@ justfile
 **/tests
 demo/
 
+####
 #### This must match .gitignore ####
+####
+
 .DS_Store
 target/
 **/*.rs.bk
@@ -22,5 +25,13 @@ test_log*
 pg_data/
 config.yml
 tests/output/
+tests/mbtiles_temp_files/
 tmp/
 .aws-sam/
+
+**/node_modules/
+**/dist/
+
+####
+#### Above content must match .gitignore ####
+####
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -142,11 +142,8 @@ jobs:
           for target in "aarch64-unknown-linux-musl" "x86_64-unknown-linux-musl"; do
             echo -e "\n----------------------------------------------"
             echo "Building $target"
-
             export "CARGO_TARGET_$(echo $target | tr 'a-z-' 'A-Z_')_RUSTFLAGS"='-C strip=debuginfo'
-            cross build --release --target $target --package mbtiles
-            cross build --release --target $target --package martin
-
+            cross build --release --target $target --workspace
             mkdir -p target_releases/$target
             mv target/$target/release/martin target_releases/$target
             mv target/$target/release/martin-cp target_releases/$target

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
+####
 #### This must match .dockerignore ####
+####
+
 .DS_Store
 target/
 **/*.rs.bk
@@ -13,3 +16,10 @@ tests/output/
 tests/mbtiles_temp_files/
 tmp/
 .aws-sam/
+
+**/node_modules/
+**/dist/
+
+####
+#### Above content must match .dockerignore ####
+####