From f3ee583a93b0d9f47388c8619dc7baf8475c5f85 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 13:11:11 -0600 Subject: [PATCH 01/26] Create publish-gem.yml --- .github/workflows/publish-gem.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/publish-gem.yml diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml new file mode 100644 index 00000000..c2e0a053 --- /dev/null +++ b/.github/workflows/publish-gem.yml @@ -0,0 +1,21 @@ +name: Publish Gem + +on: + push: + tags: + - '*' + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + - name: Build gem + run: | + gem build github-pages.gemspec + - name: Publish + run: | + gem push github-pages.gem --key ${{ secrets.PAGES_GEM_PUBLISH }} From bb1d50ebb6fe0be69bd55ebd545019837c3b83d5 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 13:12:46 -0600 Subject: [PATCH 02/26] add ruby version --- .github/workflows/publish-gem.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index c2e0a053..3c4d7293 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -13,6 +13,8 @@ jobs: uses: actions/checkout@v3 - name: Setup Ruby uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.2' - name: Build gem run: | gem build github-pages.gemspec From ecb7a8aa9d63ce238035e60abf4446c6ed446c86 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 13:19:34 -0600 Subject: [PATCH 03/26] Update publish-gem.yml --- .github/workflows/publish-gem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 3c4d7293..d7eca5b9 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.2' + ruby-version: '2.7.3' - name: Build gem run: | gem build github-pages.gemspec From 31bce95c151021f8d0584605b72a7b59d7c0d764 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 13:25:37 -0600 Subject: [PATCH 04/26] Update publish-gem.yml --- .github/workflows/publish-gem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index d7eca5b9..3c4d7293 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7.3' + ruby-version: '3.2' - name: Build gem run: | gem build github-pages.gemspec From 2d66a27538bf078b71a92f23fb0a34ac7afb498a Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 15:32:50 -0600 Subject: [PATCH 05/26] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6b84ef29..e92e0a4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=2.7.3 +ARG RUBY_VERSION=3.2 FROM ruby:$RUBY_VERSION RUN apt-get update \ From 351e4a73908fdc37c6eadf2d481e02a58287783f Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 15:34:18 -0600 Subject: [PATCH 06/26] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e92e0a4d..6b84ef29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.2 +ARG RUBY_VERSION=2.7.3 FROM ruby:$RUBY_VERSION RUN apt-get update \ From 8c97daf600f63d3690bef0f15747f9d2ec230031 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 15:34:34 -0600 Subject: [PATCH 07/26] Update publish-gem.yml --- .github/workflows/publish-gem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 3c4d7293..d7eca5b9 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.2' + ruby-version: '2.7.3' - name: Build gem run: | gem build github-pages.gemspec From 733764923ecf6edfe8d5c15bed7fb1aca97512b4 Mon Sep 17 00:00:00 2001 From: yimysty Date: Tue, 2 Jan 2024 13:45:43 -0800 Subject: [PATCH 08/26] update gem update --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6b84ef29..e15924a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,8 @@ RUN apt-get update \ make \ nodejs -RUN gem update --system +# final version for rubygems-update to supoprt ruby 2.7, consider removing this after upgraded to ruby 3.0 +RUN gem update --system 3.4.22 COPY .git /src/gh/pages-gem/.git COPY Gemfile* /src/gh/pages-gem/ From 549fa797a8ee06a5a2075d9f4eefa91054ccf8fa Mon Sep 17 00:00:00 2001 From: yimysty Date: Tue, 2 Jan 2024 13:48:44 -0800 Subject: [PATCH 09/26] upgrade to 2.7.8 --- .github/workflows/publish-gem.yml | 2 +- .ruby-version | 2 +- Dockerfile | 2 +- Dockerfile.alpine | 2 +- script/cibuild-docker | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index d7eca5b9..4826e637 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7.3' + ruby-version: '2.7.8' - name: Build gem run: | gem build github-pages.gemspec diff --git a/.ruby-version b/.ruby-version index 2c9b4ef4..6a81b4c8 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.3 +2.7.8 diff --git a/Dockerfile b/Dockerfile index e15924a3..b7a20d34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=2.7.3 +ARG RUBY_VERSION=2.7.8 FROM ruby:$RUBY_VERSION RUN apt-get update \ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 3c572c2f..d624ff80 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM ruby:2.7.3-alpine +FROM ruby:2.7.8-alpine RUN apk update && apk add --no-cache \ git diff --git a/script/cibuild-docker b/script/cibuild-docker index 7a6ca87d..2a02658a 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -3,7 +3,7 @@ set -ex # Set the ruby version in the Action definition matrix. -: "${RUBY_VERSION:="2.7.3"}" +: "${RUBY_VERSION:="2.7.8"}" docker build --build-arg "RUBY_VERSION=$RUBY_VERSION" -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From d7615e1cfee4b3632422daffbd0cbff6a965cbca Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 16:03:19 -0600 Subject: [PATCH 10/26] Update publish-gem.yml --- .github/workflows/publish-gem.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 4826e637..e48c355d 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -1,9 +1,8 @@ name: Publish Gem on: - push: - tags: - - '*' + release: + types: [released] jobs: release: From a1e407c1f7d6466cdf4d1191e992377be2d2fefa Mon Sep 17 00:00:00 2001 From: tsusdere Date: Wed, 3 Jan 2024 16:46:49 -0600 Subject: [PATCH 11/26] change ruby version --- .github/workflows/publish-gem.yml | 2 +- .ruby-version | 2 +- Dockerfile | 4 ++-- Dockerfile.alpine | 2 +- script/cibuild-docker | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index e48c355d..0ae06f3f 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7.8' + ruby-version: "3.2" - name: Build gem run: | gem build github-pages.gemspec diff --git a/.ruby-version b/.ruby-version index 6a81b4c8..a3ec5a4b 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.8 +3.2 diff --git a/Dockerfile b/Dockerfile index b7a20d34..43e0bb02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=2.7.8 +ARG RUBY_VERSION=3.2 FROM ruby:$RUBY_VERSION RUN apt-get update \ @@ -9,7 +9,7 @@ RUN apt-get update \ nodejs # final version for rubygems-update to supoprt ruby 2.7, consider removing this after upgraded to ruby 3.0 -RUN gem update --system 3.4.22 +RUN gem update --system COPY .git /src/gh/pages-gem/.git COPY Gemfile* /src/gh/pages-gem/ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index d624ff80..d3c4eccf 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM ruby:2.7.8-alpine +FROM ruby:3.2-alpine RUN apk update && apk add --no-cache \ git diff --git a/script/cibuild-docker b/script/cibuild-docker index 2a02658a..2ba771ab 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -3,7 +3,7 @@ set -ex # Set the ruby version in the Action definition matrix. -: "${RUBY_VERSION:="2.7.8"}" +: "${RUBY_VERSION:="3.2"}" docker build --build-arg "RUBY_VERSION=$RUBY_VERSION" -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From 3980c1a55497763355c6bef2ac330657fed95fb4 Mon Sep 17 00:00:00 2001 From: tsusdere Date: Wed, 3 Jan 2024 16:50:15 -0600 Subject: [PATCH 12/26] add version to update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 43e0bb02..45d58c6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update \ nodejs # final version for rubygems-update to supoprt ruby 2.7, consider removing this after upgraded to ruby 3.0 -RUN gem update --system +RUN gem update --system 3.2 COPY .git /src/gh/pages-gem/.git COPY Gemfile* /src/gh/pages-gem/ From 90b989b2131f2c012516677d49a64c97143dc50c Mon Sep 17 00:00:00 2001 From: tsusdere Date: Wed, 3 Jan 2024 16:52:03 -0600 Subject: [PATCH 13/26] revert to working update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 45d58c6d..42ed7c0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update \ nodejs # final version for rubygems-update to supoprt ruby 2.7, consider removing this after upgraded to ruby 3.0 -RUN gem update --system 3.2 +RUN gem update --system 3.4.22 COPY .git /src/gh/pages-gem/.git COPY Gemfile* /src/gh/pages-gem/ From 7c86cdb4a8e6c072ec9d1ef0c6dd2201e69e562e Mon Sep 17 00:00:00 2001 From: tsusdere Date: Wed, 3 Jan 2024 17:02:07 -0600 Subject: [PATCH 14/26] add 3.2 --- .github/workflows/push.yml | 1 + .travis.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 8ebfb0cb..aacec0fe 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -9,6 +9,7 @@ jobs: ruby: - 2.6 - 2.7 + - 3.2 steps: - uses: actions/checkout@v4 - name: script/cibuild-docker diff --git a/.travis.yml b/.travis.yml index 1b620224..a54af907 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ rvm: - 2.5 - 2.6 - 2.7 + - 3.2 branches: only: From d73437f8839d26229db356a7fd1bc8dd9d31de34 Mon Sep 17 00:00:00 2001 From: tsusdere Date: Wed, 3 Jan 2024 17:12:00 -0600 Subject: [PATCH 15/26] remove 2.6 --- .github/workflows/push.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index aacec0fe..eac75798 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,9 +7,11 @@ jobs: strategy: matrix: ruby: - - 2.6 - 2.7 + - 3.0 + - 3.1 - 3.2 + - 3.3 steps: - uses: actions/checkout@v4 - name: script/cibuild-docker From 9ccadb72b949e52608ed83bb3a5ba0cd2fc4333a Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Thu, 4 Jan 2024 11:06:54 -0600 Subject: [PATCH 16/26] Update push.yml --- .github/workflows/push.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index eac75798..82294647 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,11 +7,9 @@ jobs: strategy: matrix: ruby: - - 2.7 - 3.0 - 3.1 - 3.2 - - 3.3 steps: - uses: actions/checkout@v4 - name: script/cibuild-docker From 8dd7a8027531c3a83d959196ecd67096e327d731 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Thu, 4 Jan 2024 11:12:47 -0600 Subject: [PATCH 17/26] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index a54af907..a2bf57df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ rvm: - 2.5 - 2.6 - 2.7 + - 3.0 + - 3.1 - 3.2 branches: From 48da3d252487069e88a22370b6818882c15a7e1f Mon Sep 17 00:00:00 2001 From: tsusdere Date: Thu, 4 Jan 2024 11:26:51 -0600 Subject: [PATCH 18/26] test 3.4 for CI --- .github/workflows/publish-gem.yml | 2 +- .github/workflows/push.yml | 3 +-- .ruby-version | 2 +- .travis.yml | 6 +----- Dockerfile | 2 +- Dockerfile.alpine | 2 +- script/cibuild-docker | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 0ae06f3f..57de3a52 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: "3.2" + ruby-version: "3.4" - name: Build gem run: | gem build github-pages.gemspec diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 82294647..5a8eea22 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -8,8 +8,7 @@ jobs: matrix: ruby: - 3.0 - - 3.1 - - 3.2 + - 3.4.22 steps: - uses: actions/checkout@v4 - name: script/cibuild-docker diff --git a/.ruby-version b/.ruby-version index a3ec5a4b..ffbf6d87 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2 +3.4.22 diff --git a/.travis.yml b/.travis.yml index a2bf57df..236ea7a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,7 @@ language: ruby rvm: - - 2.5 - - 2.6 - - 2.7 - 3.0 - - 3.1 - - 3.2 + - 3.4.22 branches: only: diff --git a/Dockerfile b/Dockerfile index 42ed7c0b..873595ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.2 +ARG RUBY_VERSION=3.4.22 FROM ruby:$RUBY_VERSION RUN apt-get update \ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index d3c4eccf..edaa0640 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM ruby:3.2-alpine +FROM ruby:3.4.22-alpine RUN apk update && apk add --no-cache \ git diff --git a/script/cibuild-docker b/script/cibuild-docker index 2ba771ab..8bae686f 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -3,7 +3,7 @@ set -ex # Set the ruby version in the Action definition matrix. -: "${RUBY_VERSION:="3.2"}" +: "${RUBY_VERSION:="3.4.22"}" docker build --build-arg "RUBY_VERSION=$RUBY_VERSION" -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From 460897fdf92b1c7cc98762357fbf3d29d18001c1 Mon Sep 17 00:00:00 2001 From: tsusdere Date: Thu, 4 Jan 2024 11:28:53 -0600 Subject: [PATCH 19/26] update version --- .github/workflows/push.yml | 2 +- .ruby-version | 2 +- .travis.yml | 2 +- Dockerfile | 2 +- Dockerfile.alpine | 2 +- script/cibuild-docker | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 5a8eea22..644e51f8 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -8,7 +8,7 @@ jobs: matrix: ruby: - 3.0 - - 3.4.22 + - 3.4 steps: - uses: actions/checkout@v4 - name: script/cibuild-docker diff --git a/.ruby-version b/.ruby-version index ffbf6d87..2f4b6075 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.22 +3.4 diff --git a/.travis.yml b/.travis.yml index 236ea7a4..339a167a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby rvm: - 3.0 - - 3.4.22 + - 3.4 branches: only: diff --git a/Dockerfile b/Dockerfile index 873595ec..0e647ba9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.4.22 +ARG RUBY_VERSION=3.4 FROM ruby:$RUBY_VERSION RUN apt-get update \ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index edaa0640..ec5a2fe3 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM ruby:3.4.22-alpine +FROM ruby:3.4-alpine RUN apk update && apk add --no-cache \ git diff --git a/script/cibuild-docker b/script/cibuild-docker index 8bae686f..2e95c5bb 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -3,7 +3,7 @@ set -ex # Set the ruby version in the Action definition matrix. -: "${RUBY_VERSION:="3.4.22"}" +: "${RUBY_VERSION:="3.4"}" docker build --build-arg "RUBY_VERSION=$RUBY_VERSION" -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From 798d7780b1898b6c9ab16056f7d51a02c0d37ed2 Mon Sep 17 00:00:00 2001 From: tsusdere Date: Thu, 4 Jan 2024 11:32:02 -0600 Subject: [PATCH 20/26] update --- .github/workflows/publish-gem.yml | 2 +- .github/workflows/push.yml | 2 +- .ruby-version | 2 +- .travis.yml | 2 +- Dockerfile | 2 +- Dockerfile.alpine | 2 +- script/cibuild-docker | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 57de3a52..9ece656d 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: "3.4" + ruby-version: "3.3" - name: Build gem run: | gem build github-pages.gemspec diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 644e51f8..2f6987d5 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -8,7 +8,7 @@ jobs: matrix: ruby: - 3.0 - - 3.4 + - 3.3 steps: - uses: actions/checkout@v4 - name: script/cibuild-docker diff --git a/.ruby-version b/.ruby-version index 2f4b6075..eb39e538 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4 +3.3 diff --git a/.travis.yml b/.travis.yml index 339a167a..449bd734 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby rvm: - 3.0 - - 3.4 + - 3.3 branches: only: diff --git a/Dockerfile b/Dockerfile index 0e647ba9..cd81f2d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.4 +ARG RUBY_VERSION=3.3 FROM ruby:$RUBY_VERSION RUN apt-get update \ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index ec5a2fe3..aea69e92 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM ruby:3.4-alpine +FROM ruby:3.3-alpine RUN apk update && apk add --no-cache \ git diff --git a/script/cibuild-docker b/script/cibuild-docker index 2e95c5bb..6b1c91f0 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -3,7 +3,7 @@ set -ex # Set the ruby version in the Action definition matrix. -: "${RUBY_VERSION:="3.4"}" +: "${RUBY_VERSION:="3.3"}" docker build --build-arg "RUBY_VERSION=$RUBY_VERSION" -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From fa1b540f818f3fe4f33d8e82e53f22b93d895c67 Mon Sep 17 00:00:00 2001 From: tsusdere Date: Thu, 4 Jan 2024 18:18:41 -0600 Subject: [PATCH 21/26] change ruby version --- .github/workflows/push.yml | 4 ++-- .travis.yml | 21 --------------------- Dockerfile | 2 +- script/cibuild-docker | 5 +---- 4 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2f6987d5..ffb1ee7f 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,8 +7,8 @@ jobs: strategy: matrix: ruby: - - 3.0 - - 3.3 + - '3.0' + - '3.3' steps: - uses: actions/checkout@v4 - name: script/cibuild-docker diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 449bd734..00000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -language: ruby -rvm: - - 3.0 - - 3.3 - -branches: - only: - - master - -before_install: - - gem update --system - - gem install bundler -script: "script/cibuild" -env: - global: - - NOKOGIRI_USE_SYSTEM_LIBRARIES=true - -notifications: - email: false - -cache: bundler diff --git a/Dockerfile b/Dockerfile index cd81f2d9..f0746a25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update \ nodejs # final version for rubygems-update to supoprt ruby 2.7, consider removing this after upgraded to ruby 3.0 -RUN gem update --system 3.4.22 +RUN gem update --system COPY .git /src/gh/pages-gem/.git COPY Gemfile* /src/gh/pages-gem/ diff --git a/script/cibuild-docker b/script/cibuild-docker index 6b1c91f0..903baa53 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -2,8 +2,5 @@ set -ex -# Set the ruby version in the Action definition matrix. -: "${RUBY_VERSION:="3.3"}" - -docker build --build-arg "RUBY_VERSION=$RUBY_VERSION" -t github-pages . +docker build --build-arg -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From 117fd758cf947bd30652c2a6bf29b7588b06a2cf Mon Sep 17 00:00:00 2001 From: tsusdere Date: Thu, 4 Jan 2024 18:20:19 -0600 Subject: [PATCH 22/26] update jekyll --- lib/github-pages/dependencies.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index dba5cc26..ad782395 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -7,7 +7,7 @@ module GitHubPages class Dependencies VERSIONS = { # Jekyll - "jekyll" => "3.9.3", + "jekyll" => "3.9.4", "jekyll-sass-converter" => "1.5.2", # Converters @@ -63,7 +63,7 @@ def self.version_report require "nokogiri" { - "ruby" => RUBY_VERSION, + "ruby" => "3.3", # Gem versions we're curious about "github-pages" => VERSION.to_s, From ed0d437542a055630c9c0279098b1cf411d9af2f Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Thu, 4 Jan 2024 18:21:53 -0600 Subject: [PATCH 23/26] Update cibuild-docker --- script/cibuild-docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild-docker b/script/cibuild-docker index 903baa53..374ac15e 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -2,5 +2,5 @@ set -ex -docker build --build-arg -t github-pages . +docker build -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From 91e261dcb8c3afe822ef570bb4f688e8b04cf779 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Thu, 4 Jan 2024 18:27:43 -0600 Subject: [PATCH 24/26] Update .rubocop.yml --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index fbcea5f9..9cbf940c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -23,7 +23,7 @@ require: - rubocop-performance AllCops: - TargetRubyVersion: 2.5 + TargetRubyVersion: 3.0 Exclude: - 'bin/**/*' - 'script/**/*' From c31c982b78976a197dfe34c5ca76a9d127058cbc Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Fri, 5 Jan 2024 12:37:02 -0600 Subject: [PATCH 25/26] Update github-pages.gemspec --- github-pages.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github-pages.gemspec b/github-pages.gemspec index 3602f4f8..dacbb09f 100644 --- a/github-pages.gemspec +++ b/github-pages.gemspec @@ -30,5 +30,5 @@ Gem::Specification.new do |s| s.add_development_dependency("jekyll_test_plugin_malicious", "~> 0.2") s.add_development_dependency("pry", "~> 0.10") s.add_development_dependency("rspec", "~> 3.3") - s.add_development_dependency("rubocop-github", "0.16.0") + s.add_development_dependency("rubocop-github", "0.20.0") end From 47322fd2c858bdab9ca79869540b972e530d9c71 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Fri, 5 Jan 2024 12:39:19 -0600 Subject: [PATCH 26/26] Update Gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 464ed458..31363899 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gemspec gem "jekyll-octicons" group :test do - gem "rubocop", "~> 0.79" + gem "rubocop", "~> 1.37" gem "rubocop-performance" gem "webmock" end