Merge pull request #1315 from coderdojo-japan/actions

yasulab · web-flow · commit cd8c2689136e · 2021-07-10T16:23:42.000+09:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,40 @@
+name: actions
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - "*"
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      DATABASE_HOST: localhost
+      TZ: Asia/Tokyo
+      SCRIVITO_EMAIL: test@example.com
+      SCRIVITO_PASSWORD: testpassword
+      SCRIVITO_TENANT: ${{ secrets.SCRIVITO_TENANT }}
+      SCRIVITO_API_KEY: ${{ secrets.SCRIVITO_API_KEY }}
+    services:
+      db:
+        image: postgres:10.4-alpine
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7.3
+          bundler-cache: true
+      - name: prepare db
+        run: |
+          bundle exec rails db:create
+          bundle exec rails db:setup
+      - name: rspec
+        run: bundle exec rails spec
diff --git a/.travis.yml b/.travis.yml
diff --git a/Procfile b/Procfile
@@ -1 +1,2 @@
 web: bundle exec puma -C config/puma.rb
+release: ./scripts/release.sh
diff --git a/config/database.yml b/config/database.yml
@@ -20,10 +20,10 @@ default: &default
   # For details on connection pooling, see Rails configuration guide
   # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  username: <%= ENV.fetch('DATABASE_USER') { '' } %>
-  password: <%= ENV.fetch('DATABASE_PASSWORD') { '' } %>
-  host: <%= ENV.fetch('DATABASE_HOST') { '' } %>
-  port: <%= ENV.fetch('DATABASE_PORT') { '' } %>
+  username: <%= ENV.fetch('DATABASE_USER') { 'postgres' } %>
+  password: <%= ENV.fetch('DATABASE_PASSWORD') { 'password' } %>
+  host: <%= ENV.fetch('DATABASE_HOST') { 'db' } %>
+  port: <%= ENV.fetch('DATABASE_PORT') { '5432' } %>
 
 development:
   <<: *default
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     depends_on:
       - db
   db:
-    image: "postgres:10.4"
+    image: "postgres:10.4-alpine"
     environment:
       - "POSTGRES_USER=postgres"
       - "POSTGRES_PASSWORD=password"
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -0,0 +1,7 @@
+set -e
+
+bundle exec rails db:migrate
+bundle exec rails db:seed
+bundle exec rails dojos:update_db_by_yaml
+bundle exec rails dojo_event_services:upsert
+bundle exec rails podcasts:upsert

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`web: bundle exec puma -C config/puma.rb`
	`2`	`+release: ./scripts/release.sh`