Skip to content

Commit e1b2f3e

Browse files
authored
Merge pull request #75 from UW-Macrostrat/update-build
Update build
2 parents b1680ed + efe1fb8 commit e1b2f3e

File tree

104 files changed

+3280
-9942
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+3280
-9942
lines changed

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.7.0
1+
22.13.1

.prettierignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.tool-versions

Lines changed: 0 additions & 1 deletion
This file was deleted.

.yarn/releases/yarn-4.3.1.cjs

Lines changed: 0 additions & 894 deletions
This file was deleted.

.yarn/releases/yarn-4.9.4.cjs

Lines changed: 942 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
compressionLevel: mixed
2-
3-
enableGlobalCache: false
4-
5-
nodeLinker: node-modules
1+
nodeLinker: pnp
62

73
packageExtensions:
84
debug@*:
@@ -16,4 +12,4 @@ pnpFallbackMode: all
1612

1713
pnpMode: loose
1814

19-
yarnPath: .yarn/releases/yarn-4.3.1.cjs
15+
yarnPath: .yarn/releases/yarn-4.9.4.cjs

Dockerfile

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20
1+
FROM node:22
22

33
# Install rsync
44
RUN apt-get update && apt-get install -y rsync
@@ -10,22 +10,6 @@ WORKDIR /usr/src/app
1010
COPY .yarn/releases .yarn/releases
1111
COPY .yarnrc.yml yarn.lock package.json ./
1212

13-
# Copy only the elements needed for a Yarn install to take advantage of
14-
# Docker's layer caching
15-
# This is complex because we are working with multiple workspaces.
16-
17-
# Copy package JSON files with wildcards
18-
# This scoops up all package.json files in the directory and subdirectories
19-
# to deal with Yarn workspaces. However it requires BUILDKIT to be enabled,
20-
# which is done by setting DOCKER_BUILDKIT=1 in the environment
21-
RUN --mount=type=bind,target=/docker-context \
22-
cd /docker-context/; \
23-
find . -name "package.json" -mindepth 0 -maxdepth 5 -exec cp --parents "{}" /usr/src/app/ \;
24-
25-
RUN yarn install --immutable
26-
27-
28-
2913
# Load the cache from the previous build
3014
RUN --mount=type=cache,target=/yarn-cache \
3115
rsync -a /yarn-cache/ .yarn/cache/ \

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ debug:
1919
node --inspect=0.0.0.0:9229 /code/server.js
2020

2121
publish:
22-
docker build --platform=linux/amd64 -t $(TAG) .
23-
docker push $(TAG)
24-
25-
#nothing changing; testing CI/CD pipeline
22+
# Ensure the git repository is clean
23+
@git diff --quiet || (echo "Uncommitted changes present. Please commit or stash them before publishing." && exit 1)
24+
git tag -a v$(VERSION) -m "Version $(VERSION)"

index.js

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)