Merge pull request #357 from codeforjapan/develop

update decidim v0.24.3
codeforjapan · Apr 8, 2022 · f381ae2 · f381ae2
2 parents 267487d + 8289c48
commit f381ae2
Show file tree

Hide file tree

Showing 251 changed files with 8,495 additions and 27,600 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -30,8 +30,8 @@ jobs:
         id: set-env-production
         if: endsWith(github.ref, 'heads/master') || contains(github.ref, 'tags/v')
         run: |
-          echo "IMAGE_TAG_PREFIX=production-v0-23-5" >> $GITHUB_ENV
-          echo "EB_ENVIRONMENT_NAME=production-v0-23-5" >> $GITHUB_ENV
+          echo "IMAGE_TAG_PREFIX=production-v0-24-3" >> $GITHUB_ENV
+          echo "EB_ENVIRONMENT_NAME=production-v0-24-3" >> $GITHUB_ENV
 
       - name: Output App Env
         id: output-app-env

diff --git a/.github/workflows/rails-test.yml b/.github/workflows/rails-test.yml
@@ -6,6 +6,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
+    env:
+      DATABASE_HOST: 127.0.0.1
+      DATABASE_PORT: 5432
+      DATABASE_USERNAME: postgres
+      DATABASE_PASSWORD: postgres
+      RAILS_ENV: test
+
     services:
       db:
         image: postgres:12
@@ -37,17 +44,11 @@ jobs:
       with:
         ruby-version: 2.7
         bundler-cache: true
-    - name: Build and Test with RSpec
-      env:
-        DATABASE_HOST: 127.0.0.1
-        DATABASE_PORT: 5432
-        DATABASE_USERNAME: postgres
-        DATABASE_PASSWORD: postgres
-        RAILS_ENV: test
-        REDIS_PORT: ${{ job.services.redis.ports[6379] }}
+    - name: Migrate DB
       run: |
-        bundle install --jobs 4 --retry 3
         bundle exec rails db:create db:migrate
+    - name: Test with RSpec
+      run: |
         bundle exec rails spec
     - name: Lint by RuboCop
       run: |