From 0d7203ee7b3bc3bb40bb612a08e4ca8e3ab62069 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 5 Sep 2024 20:46:09 +0530 Subject: [PATCH 1/5] Add GitHub Actions workflow for CI --- .github/workflows/ci.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000..35094cda54 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,29 @@ +name: Continuous Integration +on: + push: + branches: + - "2.5-stable" + pull_request: + branches: + - "2.5-stable" +jobs: + build: + name: "Test with Jekyll ${{ matrix.jekyll }} (Ruby ${{ matrix.ruby }} on ${{ matrix.os }})" + runs-on: "${{ matrix.os }}-latest" + strategy: + matrix: + jekyll: ["~> 3.9", "~> 4.2"] + ruby: ["2.7", "3.3"] + os: ["ubuntu", "macos", "windows"] + env: + JEKYLL_VERSION: ${{ matrix.jekyll }} + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + - name: "Set Up Ruby ${{ matrix.ruby }}" + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + bundler-cache: true + - name: Run tests + run: script/cibuild From 9b653277fa938d8112b1f3882b53fb3b7d53f0cd Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 5 Sep 2024 20:50:02 +0530 Subject: [PATCH 2/5] Delete .travis.yml --- .travis.yml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 455e5778e1..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -language: ruby -cache: bundler -rvm: - - 2.6 - - 2.4 - -before_install: gem update --system --no-document -install: script/bootstrap -script: script/cibuild - -env: - matrix: - - JEKYLL_VERSION="~> 3.5" - - JEKYLL_VERSION=">= 4.0.0.pre.alpha1" From 497b8c0addc88b19b7a11c19aa2fd5a42f580a1e Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 5 Sep 2024 20:55:38 +0530 Subject: [PATCH 3/5] Conditionally load GFM-parser gem in CI builds --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 46cdbf0279..cbec53b670 100644 --- a/Gemfile +++ b/Gemfile @@ -4,3 +4,4 @@ source "https://rubygems.org" gemspec gem "jekyll", ENV["JEKYLL_VERSION"] if ENV["JEKYLL_VERSION"] +gem "kramdown-parser-gfm" if ENV["JEKYLL_VERSION"] == "~> 3.9" From 2ac13028f8c21895ac4d21bcf9bbedf55ca5edd1 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 5 Sep 2024 21:02:33 +0530 Subject: [PATCH 4/5] Disable `fast-fail` in workflow --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35094cda54..87ed3e6b6d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,7 @@ jobs: name: "Test with Jekyll ${{ matrix.jekyll }} (Ruby ${{ matrix.ruby }} on ${{ matrix.os }})" runs-on: "${{ matrix.os }}-latest" strategy: + fail-fast: false matrix: jekyll: ["~> 3.9", "~> 4.2"] ruby: ["2.7", "3.3"] From 981897869488bea45f21d19e4000a04012de3620 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Thu, 5 Sep 2024 21:11:49 +0530 Subject: [PATCH 5/5] Test only on `ubuntu-latest` os --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87ed3e6b6d..e4ed5c41d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,14 +8,13 @@ on: - "2.5-stable" jobs: build: - name: "Test with Jekyll ${{ matrix.jekyll }} (Ruby ${{ matrix.ruby }} on ${{ matrix.os }})" - runs-on: "${{ matrix.os }}-latest" + name: "Test with Jekyll ${{ matrix.jekyll }} (Ruby ${{ matrix.ruby }})" + runs-on: ubuntu-latest strategy: fail-fast: false matrix: jekyll: ["~> 3.9", "~> 4.2"] ruby: ["2.7", "3.3"] - os: ["ubuntu", "macos", "windows"] env: JEKYLL_VERSION: ${{ matrix.jekyll }} steps: