Merge branch 'develop'

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Create env file
         uses: SpicyPizza/[email protected]
       - name: Release Gem
-        run: docker-compose run --rm core bash -c "make release_gem"
+        run: docker compose run --rm core bash -c "make release_gem"
         env:
           RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
       - name: Set up Docker Buildx

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: core
   specs:
-    uffizzi_core (2.4.9)
+    uffizzi_core (2.4.10)
       aasm
       actionpack (~> 6.1.0)
       active_model_serializers

Makefile

@@ -1,8 +1,8 @@
 .PHONY: release release_patch release_minor release_major test
 
-NEXT_PATCH=$(shell docker-compose run --rm core bash -c "bundle exec bump show-next patch")
-NEXT_MINOR=$(shell docker-compose run --rm core bash -c "bundle exec bump show-next minor")
-NEXT_MAJOR=$(shell docker-compose run --rm core bash -c "bundle exec bump show-next major")
+NEXT_PATCH=$(shell docker compose run --rm core bash -c "bundle exec bump show-next patch")
+NEXT_MINOR=$(shell docker compose run --rm core bash -c "bundle exec bump show-next minor")
+NEXT_MAJOR=$(shell docker compose run --rm core bash -c "bundle exec bump show-next major")
 
 release_patch: export VERSION=${NEXT_PATCH}
 release_patch:
@@ -19,9 +19,9 @@ release_major:
 release:
 	git checkout develop
 	@echo 'Set a new version'
-	docker-compose run --rm core bash -c "bundle exec bump set ${VERSION}"
-	docker-compose run --rm core bash -c "bundle update uffizzi_core --conservative "
-	docker-compose run --rm web bash -c "bundle update uffizzi_core --conservative "
+	docker compose run --rm core bash -c "bundle exec bump set ${VERSION}"
+	docker compose run --rm core bash -c "bundle update uffizzi_core --conservative "
+	docker compose run --rm web bash -c "bundle update uffizzi_core --conservative "
 	git commit -am "Change version to ${VERSION}"
 	@echo 'Update remote origin'
 	git push origin develop
@@ -34,7 +34,7 @@ release:
 	git push origin core_v${VERSION}
 
 test:
-	docker-compose run --rm core bash -c "bundle exec rails test"
+	docker compose run --rm core bash -c "bundle exec rails test"
 
 lint:
-	docker-compose run --rm web bash -c "bundle exec rubocop -A"
+	docker compose run --rm web bash -c "bundle exec rubocop -A"

core/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uffizzi_core (2.4.9)
+    uffizzi_core (2.4.10)
       aasm
       actionpack (~> 6.1.0)
       active_model_serializers

core/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '2.4.9'
+  VERSION = '2.4.10'
 end