Skip to content

Commit

Permalink
updates to build
Browse files Browse the repository at this point in the history
  • Loading branch information
martinpeck committed Aug 2, 2024
1 parent 918aa40 commit 341dd66
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 164 deletions.
14 changes: 0 additions & 14 deletions .devcontainer/Dockerfile

This file was deleted.

26 changes: 0 additions & 26 deletions .devcontainer/base.Dockerfile

This file was deleted.

48 changes: 20 additions & 28 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,27 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/jekyll
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/jekyll
{
"name": "Jekyll",
"build": {
"dockerfile": "Dockerfile",
"args": {
// Update 'VARIANT' to pick a Debian OS version: bullseye, buster
// Use bullseye when on local arm64/Apple Silicon.
"VARIANT": "bullseye",
// Enable Node.js: pick the latest LTS version
"NODE_VERSION": "none"
}
},
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/jekyll:2-bullseye",
"features": {
"ghcr.io/devcontainers/features/ruby:1": {
"version": "2.7"
}
}

// Set *default* container specific settings.json values on container create.
"settings": {},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [],
// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [
// Jekyll server
4000,
// Live reload server
35729
],
// "forwardPorts": [],

// Uncomment the next line to run commands after the container is created.
// "postCreateCommand": "jekyll --version"

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "sh .devcontainer/post-create.sh",
// Configure tool-specific properties.
// "customizations": {},

// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode"
}
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
12 changes: 0 additions & 12 deletions .devcontainer/post-create.sh

This file was deleted.

4 changes: 0 additions & 4 deletions .github/workflows/ci-build.sh

This file was deleted.

70 changes: 0 additions & 70 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

14 changes: 8 additions & 6 deletions .github/workflows/jekyll.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Build the site in the container
run: |
docker run -v $(pwd):/workspace \
mcr.microsoft.com/vscode/devcontainers/ruby:2.7-bullseye \
/bin/bash -c "cd workspace && make ci-build"
- name: Checkout (GitHub)
uses: actions/checkout@v3

- name: Run make ci-build in dev container
uses: devcontainers/[email protected]
with:
push: never
runCmd: make ci-build
28 changes: 24 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,22 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
faraday (2.10.0)
faraday (2.10.1)
faraday-net_http (>= 2.0, < 3.2)
logger
faraday-net_http (3.1.0)
faraday-net_http (3.1.1)
net-http
ffi (1.17.0)
ffi (1.17.0-aarch64-linux-gnu)
ffi (1.17.0-aarch64-linux-musl)
ffi (1.17.0-arm-linux-gnu)
ffi (1.17.0-arm-linux-musl)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86-linux-gnu)
ffi (1.17.0-x86-linux-musl)
ffi (1.17.0-x86_64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
ffi (1.17.0-x86_64-linux-musl)
forwardable-extended (2.6.0)
http_parser.rb (0.8.0)
i18n (1.14.5)
Expand Down Expand Up @@ -65,7 +75,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.3.2)
rexml (3.3.4)
strscan
rouge (3.30.0)
safe_yaml (1.0.5)
Expand All @@ -82,7 +92,17 @@ GEM
webrick (1.8.1)

PLATFORMS
aarch64-linux-gnu
aarch64-linux-musl
arm-linux-gnu
arm-linux-musl
arm64-darwin
ruby
x86-linux-gnu
x86-linux-musl
x86_64-darwin
x86_64-linux-gnu
x86_64-linux-musl

DEPENDENCIES
jekyll (~> 3.9)
Expand All @@ -92,4 +112,4 @@ DEPENDENCIES
kramdown-parser-gfm (~> 1.1)

BUNDLED WITH
2.5.16
2.5.15

0 comments on commit 341dd66

Please sign in to comment.