diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index a84fc7f..a7a79e5 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -9,12 +9,18 @@ jobs: deploy: runs-on: cth-ubuntu-latest steps: + - uses: actions/checkout@v4 + - name: Read .ruby-version file + id: ruby + run: echo "version=$(cat .ruby-version)" >> $GITHUB_OUTPUT - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Push image uses: docker/build-push-action@v6 with: push: true + build-args: | + RUBY_VERSION=${{ steps.ruby.outputs.version }} tags: | docker.atomaka.com/budget:latest docker.atomaka.com/budget:${{gitea.sha}} diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 5e2b75a..e7754fc 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -7,10 +7,8 @@ jobs: test: runs-on: cth-ubuntu-latest steps: - - uses: https://github.com/ruby/setup-ruby@v1 - with: - ruby-version: 3.3.5 - uses: actions/checkout@v4 + - uses: https://github.com/ruby/setup-ruby@217c988b8c2bf2bacb2d5c78a7e7b18f8c34daed - uses: actions/cache@v4 with: path: vendor/bundle diff --git a/.ruby-version b/.ruby-version index fa7adc7..9c25013 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.5 +3.3.6 diff --git a/Dockerfile b/Dockerfile index 0639c80..4687452 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ # For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html # Make sure RUBY_VERSION matches the Ruby version in .ruby-version -ARG RUBY_VERSION=3.3.1 +ARG RUBY_VERSION=3.3.6 FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base # Rails app lives here diff --git a/Gemfile.lock b/Gemfile.lock index 91b4eac..50e5c7e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -309,6 +309,7 @@ GEM PLATFORMS aarch64-linux arm64-darwin-23 + arm64-darwin-24 x86_64-linux DEPENDENCIES @@ -334,4 +335,4 @@ DEPENDENCIES web-console BUNDLED WITH - 2.5.18 + 2.5.23