diff --git a/.bundle/config b/.bundle/config new file mode 100644 index 0000000..2369228 --- /dev/null +++ b/.bundle/config @@ -0,0 +1,2 @@ +--- +BUNDLE_PATH: "vendor/bundle" diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 0f1e587..548edfa 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/vscode/devcontainers/ruby:0-2 +FROM mcr.microsoft.com/devcontainers/ruby:3.1 # ENV Variables required by Jekyll ENV LANG=en_US.UTF-8 \ diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh old mode 100644 new mode 100755 index 440a9cd..3e536e8 --- a/.devcontainer/post-create.sh +++ b/.devcontainer/post-create.sh @@ -1,10 +1,22 @@ -#!/bin/sh +#!/bin/bash +set -e + +echo "Running post-create setup..." # If there's a Gemfile, then run `bundle install` # It's assumed that the Gemfile will install Jekyll too if [ -f Gemfile ]; then + echo "Configuring bundler to use local path..." + bundle config set --local path 'vendor/bundle' + + echo "Installing gems from Gemfile..." bundle install + echo "Gems installed successfully!" else # If there's no Gemfile, install Jekyll + echo "No Gemfile found, installing Jekyll directly..." sudo gem install jekyll + echo "Jekyll installed successfully!" fi + +echo "Post-create setup completed!" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dcb9d5a..12ad4d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,11 +5,16 @@ jobs: name: Build Jekyll runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Build the site in the jekyll/builder container + - uses: actions/checkout@v4 + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.1' + - name: Install dependencies run: | - export JEKYLL_VERSION=3.8 - docker run \ - -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ - -e PAGES_REPO_NWO=${{ github.repository }} \ - jekyll/builder:$JEKYLL_VERSION /bin/bash -c "chmod 777 /srv/jekyll && jekyll build --future" + gem install bundler + bundle install + - name: Build the site + run: bundle exec jekyll build --future --verbose + env: + JEKYLL_ENV: production diff --git a/.gitignore b/.gitignore index e065359..0545b63 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ _site .sass-cache .vagrant +vendor/bundle # general .DS_Store diff --git a/_config.yml b/_config.yml index a6ddc14..c0242f2 100644 --- a/_config.yml +++ b/_config.yml @@ -225,6 +225,7 @@ exclude: - README.md - screenshot.png - docs/ + - vendor/ plugins: - jekyll-paginate diff --git a/_drafts/!dogfight-milestone.md b/_drafts/!dogfight-milestone.md index a523ae7..e45e110 100644 --- a/_drafts/!dogfight-milestone.md +++ b/_drafts/!dogfight-milestone.md @@ -1 +1,7 @@ +--- +layout: post +title: Dogfight Milestone +subtitle: +tags: [] +--- the overall story of the 1st milestone diff --git a/_drafts/!gunner-assist.md b/_drafts/!gunner-assist.md index 8b13789..0655de2 100644 --- a/_drafts/!gunner-assist.md +++ b/_drafts/!gunner-assist.md @@ -1 +1,6 @@ - +--- +layout: post +title: Gunner Assist +subtitle: +tags: [] +--- diff --git a/_drafts/!physics-engine.md b/_drafts/!physics-engine.md index 8b13789..e4f904e 100644 --- a/_drafts/!physics-engine.md +++ b/_drafts/!physics-engine.md @@ -1 +1,6 @@ - +--- +layout: post +title: Physics Engine +subtitle: +tags: [] +--- diff --git a/_drafts/!pilot-assists.md b/_drafts/!pilot-assists.md index cc38f32..cf3731d 100644 --- a/_drafts/!pilot-assists.md +++ b/_drafts/!pilot-assists.md @@ -1,5 +1,11 @@ +--- +layout: post +title: Pilot Assists +subtitle: +tags: [] +--- - max speed - velocity, direct, target - - anti-drift -> breaks + - anti-drift -> breaks - reserve speed (combar maneuvering)