Merge branch 'master' of https://github.com/feedforce/ruby-rpm into support-ruby-3.1

Author: tsub

.circleci/config.yml

@@ -59,6 +59,7 @@ jobs:
           - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
       arch:
         type: enum
         enum:
@@ -75,7 +76,7 @@ jobs:
               -t feedforce/ruby-rpm:<< parameters.version >>-builder \
               -f Dockerfile-7 \
               --target builder \
-              --cache-from=feedforce/ruby-rpm:centos7 \
+              --cache-from=ghcr.io/feedforce/ruby-rpm:centos7 \
               --build-arg RUBY_X_Y_VERSION=<< parameters.version >> \
               --progress plain \
               .
@@ -94,7 +95,7 @@ jobs:
               -t feedforce/ruby-rpm:<< parameters.version >>-tester \
               -f Dockerfile-7 \
               --target tester \
-              --cache-from=feedforce/ruby-rpm:<< parameters.version >>-builder \
+              --cache-from=ghcr.io/feedforce/ruby-rpm:<< parameters.version >>-builder \
               --build-arg RUBY_X_Y_VERSION=<< parameters.version >> \
               --progress plain \
               .
@@ -133,6 +134,7 @@ jobs:
           - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
     docker:
       - image: cimg/base:stable
         environment:
@@ -178,13 +180,13 @@ workflows:
           name: ruby-<< matrix.version >>-centos7-<< matrix.arch >>-build-and-test
           matrix:
             parameters:
-              version: ["2.6", "2.7", "3.0", "3.1"]
+              version: ["2.6", "2.7", "3.0", "3.1", "3.2"]
               arch: ["amd64", "arm64"]
       - deploy:
           name: ruby-<< matrix.version >>-deploy
           matrix:
             parameters:
-              version: ["2.6", "2.7", "3.0", "3.1"]
+              version: ["2.6", "2.7", "3.0", "3.1", "3.2"]
           requires:
             - ruby-<< matrix.version >>-centos7-amd64-build-and-test
             - ruby-<< matrix.version >>-centos7-arm64-build-and-test

.circleci/github-release.sh

@@ -10,8 +10,8 @@ need_to_release() {
 }
 
 get_github_release() {
-  version=v0.7.5
-  wget https://github.com/meterup/github-release/releases/download/${version}/linux-amd64-github-release.bz2
+  version=v0.10.0
+  wget https://github.com/github-release/github-release/releases/download/${version}/linux-amd64-github-release.bz2
   bzip2 -d linux-amd64-github-release.bz2
   chmod +x linux-amd64-github-release
   mkdir -p $HOME/bin
@@ -38,6 +38,9 @@ $HOME/bin/github-release release \
   --description "not release" \
   --target master
 
+# Wait a few seconds after create release to avoid to error `could not find the release corresponding to tag ...`.
+sleep 5
+
 #
 # Upload rpm files and build a release note
 #

.github/workflows/push-docker-image.yml

@@ -0,0 +1,29 @@
+name: push-docker-image
+on:
+  workflow_dispatch:
+jobs:
+  push-docker-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    env:
+      REGISTRY: ghcr.io
+      IMAGE_NAME: ${{ github.repository }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: docker/login-action@v2
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ github.token }}
+    - uses: docker/setup-buildx-action@v2
+    - uses: docker/build-push-action@v4
+      with:
+        file: ./Dockerfile-7
+        target: base
+        tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:centos7
+        platforms: linux/amd64,linux/arm64
+        push: true
+        # See: https://github.com/community/community/discussions/45969
+        provenance: false

README.md

@@ -24,25 +24,20 @@ We create a Pull Request automatically using CircleCI.
 
 This project uses Docker to build RPMs.
 
-The Docker images are hosted at [Docker Hub](https://hub.docker.com/).
+The Docker images are hosted at [GitHub Container Registry (ghcr.io)](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry).
 
-- For CentOS 7: [`feedforce/ruby-rpm:centos7`](https://hub.docker.com/r/feedforce/ruby-rpm/)
+- For CentOS 7: `ghcr.io/feedforce/ruby-rpm:centos7`
 
 ## How to build and push Docker image
 
+Build and push Docker image to ghcr.io from GitHub Actions.
+
 ### Manually
 
-You can also build Docker images manually.
-
-```
-$ docker login
-$ docker buildx create --use
-$ docker buildx build \
-    -t feedforce/ruby-rpm:centos7 \
-    -f Dockerfile-7 \
-    --target base \
-    --build-arg BUILDKIT_INLINE_CACHE=1 \
-    --platform=linux/amd64,linux/arm64 \
-    --push \
-    .
-```
+Currently, only manual execution using the workflow_dispatch event is supported.
+
+1. Open https://github.com/feedforce/ruby-rpm/actions/workflows/push-docker-image.yml
+1. Run workflow with master branch
+1. Wait until workflow succeededs
+1. Open https://github.com/feedforce/ruby-rpm/pkgs/container/ruby-rpm
+1. Check that a new image has been pushed

ruby-2.7.spec

@@ -1,5 +1,5 @@
 Name: ruby
-Version: 2.7.5
+Version: 2.7.7
 Release: 1%{?dist}
 License: Ruby License/GPL - see COPYING
 URL: http://www.ruby-lang.org/
@@ -67,6 +67,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Thu Nov 24 2022 feedforce tech team <technical_staff@feedforce.jp> - 2.7.7
+- Update ruby version to 2.7.7
+
+* Tue Apr 12 2022 feedforce tech team <technical_staff@feedforce.jp> - 2.7.6
+- Update ruby version to 2.7.6
+
 * Wed Nov 24 2021 feedforce tech team <technical_staff@feedforce.jp> - 2.7.5
 - Update ruby version to 2.7.5
 

ruby-3.0.spec

@@ -1,5 +1,5 @@
 Name: ruby
-Version: 3.0.3
+Version: 3.0.4
 Release: 1%{?dist}
 License: Ruby License/GPL - see COPYING
 URL: http://www.ruby-lang.org/
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Tue Apr 12 2022 feedforce tech team <technical_staff@feedforce.jp> - 3.0.4
+- Update ruby version to 3.0.4
+
 * Wed Nov 24 2021 feedforce tech team <technical_staff@feedforce.jp> - 3.0.3
 - Update ruby version to 3.0.3