Merge pull request #34 from runwaylab/vendoring

vendor

.ameba.yml

@@ -10,4 +10,5 @@ Metrics/CyclomaticComplexity:
 # exclude all files in vendor/cache
 Globs:
   - "**/*.cr"
+  - "!vendor"
   - "!lib"

.crystal-version

@@ -1 +1 @@
-1.13.1
+1.13.2

.dockerignore

@@ -1,15 +1,23 @@
 docs/
-.cache/
+vendor/.cache/
+vendor/shards/install/
 .github/
 bin/
-assets/
-coverage/
 data/
 LICENSE
 Makefile
 README.md
-CONTRIBUTING.md
 SECURITY.md
 docker-compose.yml
+docker-compose.override.yml
+docker-compose.production.yml
 tmp/
 .ameba.yml
+script/release
+script/deploy
+script/update
+script/lint
+script/format
+script/acceptance
+script/all
+script/test

.github/workflows/acceptance.yml

@@ -28,7 +28,7 @@ jobs:
           crystal: ${{ steps.crystal-version.outputs.crystal }}
 
       - name: bootstrap
-        run: script/bootstrap
+        run: script/bootstrap --ci
 
       - name: set directory permissions (for ci)
         run: |

.github/workflows/build.yml

@@ -33,7 +33,7 @@ jobs:
           crystal: ${{ steps.crystal-version.outputs.crystal }}
 
       - name: bootstrap
-        run: script/bootstrap
+        run: script/bootstrap --ci
 
       - name: build
         run: script/build

.github/workflows/lint.yml

@@ -31,7 +31,7 @@ jobs:
           crystal: ${{ steps.crystal-version.outputs.crystal }}
 
       - name: bootstrap
-        run: script/bootstrap
+        run: script/bootstrap --ci
 
       - name: lint
         run: script/lint

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
           crystal: ${{ steps.crystal-version.outputs.crystal }}
 
       - name: bootstrap
-        run: script/bootstrap
+        run: script/bootstrap --ci
 
       - name: fetch version
         run: |
@@ -41,7 +41,7 @@ jobs:
       - name: build (linux x86_64)
         run: |
           mkdir -p releases
-          script/build
+          script/build --production
           mv ./bin/runway ./releases/runway-linux-x86_64
 
       - name: generate artifact attestation

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
           crystal: ${{ steps.crystal-version.outputs.crystal }}
 
       - name: bootstrap
-        run: script/bootstrap
+        run: script/bootstrap --ci
 
       - name: test
         run: script/test

.gitignore

@@ -2,12 +2,15 @@
 .cache/shards/*
 tmp/
 bin/
+!vendor/bin/
+!vendor/darwin_arm64/bin/
+!vendor/darwin_x86_64/bin/
+!vendor/linux_x86_64/bin/
 .shards/
 *.dwarf
 dist/
-
-# do not ignore vendor/*/bin directories
-!/vendor/*/bin/
+vendor/shards/install
+vendor/.cache
 
 vendor/gems/
 

Dockerfile

@@ -11,29 +11,29 @@ LABEL org.opencontainers.image.authors="Grant Birkinbine"
 WORKDIR /app
 
 # install build dependencies
-RUN apt-get update && apt-get install libssh2-1-dev -y
+RUN apt-get update && apt-get install libssh2-1-dev unzip wget -y
+
+# install yq
+RUN wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq && chmod +x /usr/bin/yq
 
 # copy core scripts
-COPY script/preinstall script/preinstall
-COPY script/update script/update
-COPY script/bootstrap script/bootstrap
-COPY script/postinstall script/postinstall
+COPY script/ script/
 
 # copy all vendored dependencies
-COPY lib/ lib/
+COPY vendor/shards/cache/ vendor/shards/cache/
 
 # copy shard files
 COPY shard.lock shard.lock
 COPY shard.yml shard.yml
 
 # bootstrap the project
-RUN USE_LINUX_VENDOR=true script/bootstrap
+RUN script/bootstrap --production
 
 # copy all source files (ensure to use a .dockerignore file for efficient copying)
 COPY . .
 
 # build the project
-RUN script/build
+RUN script/build --production
 
 # https://github.com/phusion/baseimage-docker
 FROM ghcr.io/phusion/baseimage:noble-1.0.0

acceptance/Dockerfile

@@ -4,32 +4,29 @@ FROM 84codes/crystal:1.12.1-ubuntu-24.04 AS builder
 WORKDIR /app
 
 # install build dependencies
-RUN apt-get update && apt-get install libssh2-1-dev -y
+RUN apt-get update && apt-get install libssh2-1-dev unzip wget -y
 
-# copy vendored dependencies
-COPY vendor/linux_x86_64/bin/ vendor/linux_x86_64/bin/
+# install yq
+RUN wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq && chmod +x /usr/bin/yq
 
 # copy core scripts
-COPY script/preinstall script/preinstall
-COPY script/update script/update
-COPY script/bootstrap script/bootstrap
-COPY script/postinstall script/postinstall
+COPY script/ script/
 
 # copy all vendored dependencies
-COPY lib/ lib/
+COPY vendor/shards/cache/ vendor/shards/cache/
 
 # copy shard files
 COPY shard.lock shard.lock
 COPY shard.yml shard.yml
 
 # bootstrap the project
-RUN USE_LINUX_VENDOR=true script/bootstrap
+RUN script/bootstrap --production
 
 # copy all source files (ensure to use a .dockerignore file for efficient copying)
 COPY . .
 
 # build the project
-RUN script/build
+RUN script/build --production
 
 # https://github.com/phusion/baseimage-docker
 FROM ghcr.io/phusion/baseimage:noble-1.0.0