From 5b85e42cf0f2b1f1e2922164c9592497edc8d5aa Mon Sep 17 00:00:00 2001 From: "corey.thompson" Date: Thu, 20 Feb 2025 06:44:46 -0600 Subject: [PATCH 01/10] copy from master --- .github/workflows/ci.yml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 511db2886e4a..25e744b3a959 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,11 +5,22 @@ jobs: name: Build Jekyll runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Build the site in the jekyll/builder container + - uses: actions/checkout@v4 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.3' + - name: Install dependencies + run: bundle install && bundle exec appraisal install + - name: Setup Pages + id: configure-pages + uses: actions/configure-pages@v5 + - name: Setup CI config 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" + echo "---" > _config_ci.yml + echo "baseurl: ${{ steps.configure-pages.outputs.base_path }}" >> _config_ci.yml + - name: Build site + env: + JEKYLL_ENV: production + run: bundle exec appraisal jekyll build --future --config _config_ci.yml,_config.yml + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 \ No newline at end of file From 4f0230236df564f6c27db622a426043929be5c10 Mon Sep 17 00:00:00 2001 From: "corey.thompson" Date: Thu, 20 Feb 2025 20:21:17 -0600 Subject: [PATCH 02/10] set ruby to default --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25e744b3a959..4189cf246c99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3' + ruby-version: 'default' - name: Install dependencies run: bundle install && bundle exec appraisal install - name: Setup Pages From 48ce285e1e479f7c0c4d2820c18b2d9cf4c3490c Mon Sep 17 00:00:00 2001 From: "corey.thompson" Date: Thu, 20 Feb 2025 20:23:56 -0600 Subject: [PATCH 03/10] try using latest dev instead i guess --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4189cf246c99..a1197c3eb987 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: 'default' + ruby-version: 'head' - name: Install dependencies run: bundle install && bundle exec appraisal install - name: Setup Pages From 95b6c426673b8e35e8d91731c88959ca54f14576 Mon Sep 17 00:00:00 2001 From: "corey.thompson" Date: Thu, 20 Feb 2025 20:32:26 -0600 Subject: [PATCH 04/10] try manuall installing appraisal --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1197c3eb987..363132a05f6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,8 +9,10 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: 'head' + - name: Install Appraisal + run: gem install bundler && gem install appraisal && bundle install && appraisal install - name: Install dependencies - run: bundle install && bundle exec appraisal install + run: bundle install && bundle install appraisal && bundle exec appraisal install - name: Setup Pages id: configure-pages uses: actions/configure-pages@v5 From 762186406a426bfdf4cd02b01f12be6e61e98318 Mon Sep 17 00:00:00 2001 From: "corey.thompson" Date: Thu, 20 Feb 2025 20:38:54 -0600 Subject: [PATCH 05/10] try simplifying appraisal install --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 363132a05f6e..a1197c3eb987 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,10 +9,8 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: 'head' - - name: Install Appraisal - run: gem install bundler && gem install appraisal && bundle install && appraisal install - name: Install dependencies - run: bundle install && bundle install appraisal && bundle exec appraisal install + run: bundle install && bundle exec appraisal install - name: Setup Pages id: configure-pages uses: actions/configure-pages@v5 From 9b55f605ea7ce3c0afd8ee64f1a6ecdb01ed4583 Mon Sep 17 00:00:00 2001 From: "corey.thompson" Date: Thu, 20 Feb 2025 20:42:56 -0600 Subject: [PATCH 06/10] try just installing the gem for appraisal --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1197c3eb987..5291620c2cc9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,8 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: 'head' + - name: Install Appraisal + run: gem install appraisal - name: Install dependencies run: bundle install && bundle exec appraisal install - name: Setup Pages From 187a2af1af1f8509584e5095087bcf848f4170eb Mon Sep 17 00:00:00 2001 From: "corey.thompson" Date: Thu, 20 Feb 2025 20:46:34 -0600 Subject: [PATCH 07/10] bundle exec appraisal install should work according to the ai overlords --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5291620c2cc9..a1197c3eb987 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,8 +9,6 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: 'head' - - name: Install Appraisal - run: gem install appraisal - name: Install dependencies run: bundle install && bundle exec appraisal install - name: Setup Pages From 506e8e9760ded2891a123290974a4cc34a7ebedd Mon Sep 17 00:00:00 2001 From: "corey.thompson" Date: Thu, 20 Feb 2025 20:50:03 -0600 Subject: [PATCH 08/10] we're gonna add appraisal and see if it's picked up by install *prays* --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1197c3eb987..84fd9664f760 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: with: ruby-version: 'head' - name: Install dependencies - run: bundle install && bundle exec appraisal install + run: bundle add appraisal && bundle install && bundle exec appraisal - name: Setup Pages id: configure-pages uses: actions/configure-pages@v5 From fc3616a5a208eda8ea6aebf227c394ab90c40f5f Mon Sep 17 00:00:00 2001 From: "corey.thompson" Date: Thu, 20 Feb 2025 20:51:59 -0600 Subject: [PATCH 09/10] swap back to ruby 3.3 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84fd9664f760..22303903129a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: 'head' + ruby-version: '3.3' - name: Install dependencies run: bundle add appraisal && bundle install && bundle exec appraisal - name: Setup Pages From df02fa11d9de06c125664fc2080753973be83838 Mon Sep 17 00:00:00 2001 From: "corey.thompson" Date: Thu, 20 Feb 2025 20:56:14 -0600 Subject: [PATCH 10/10] let's just not use appraisal --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22303903129a..1b081beba168 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: with: ruby-version: '3.3' - name: Install dependencies - run: bundle add appraisal && bundle install && bundle exec appraisal + run: bundle install - name: Setup Pages id: configure-pages uses: actions/configure-pages@v5 @@ -21,6 +21,6 @@ jobs: - name: Build site env: JEKYLL_ENV: production - run: bundle exec appraisal jekyll build --future --config _config_ci.yml,_config.yml + run: bundle exec jekyll build --future --config _config_ci.yml,_config.yml - name: Upload artifact uses: actions/upload-pages-artifact@v3 \ No newline at end of file