💚 (workflows) deploy in master branch

Author: an-lee

.github/workflows/deploy.yml

@@ -3,7 +3,7 @@ name: Deploy
 on:
   push:
     branches:
-      - release
+      - master
 
 jobs:
   deploy:
@@ -16,14 +16,39 @@ jobs:
         with:
           ruby-version: 2.7
 
+      - name: Setup Nodejs
+        uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: Use cached node_modules
+        uses: actions/cache@v1
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
       - name: Increasing the amount of inotify watchers
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
 
-      - name: Deploy
+      - name: Precompile
+        env:
+          RAILS_ENV: production
+          RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
         run: |
           sudo apt-get -yqq install libpq-dev
-          sudo apt-get install expect
           gem install bundler:2.1.4
-          bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
-          bin/exp ${{ secrets.PAYIN_SSH_PWD }} bundle exec mina deploy production
+          yarn install
+          bin/rails assets:precompile
+
+      - name: Deploy
+        run: |
+          sudo apt-get install expect
+          bin/deploy ${{ secrets.PAYIN_SSH_PWD }} bundle exec mina deploy production

.github/workflows/precomile.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - develop
-      - master
 
 jobs:
   test:

.github/workflows/test.yml

@@ -25,9 +25,9 @@
 /config/credentials/development.key
 
 # Ingore development & test packs
-/public/packs-dev
-/public/packs-test
-/public/assets-dev
+/public/packs
+/public/packs
+/public/assets
 
 # test result
 /coverage

.gitignore

@@ -1,6 +1,6 @@
 # Payin
 
-![Lint](https://github.com/an-lee/payin/workflows/Lint/badge.svg) ![Test](https://github.com/an-lee/payin/workflows/Test/badge.svg) ![Precompile](https://github.com/an-lee/payin/workflows/Precompile/badge.svg) ![Deploy](https://github.com/an-lee/payin/workflows/Deploy/badge.svg)
+![Lint](https://github.com/an-lee/payin/workflows/Lint/badge.svg) ![Test](https://github.com/an-lee/payin/workflows/Test/badge.svg) ![Deploy](https://github.com/an-lee/payin/workflows/Deploy/badge.svg)
 
 [Payin](https://payin.xin) is a Mixin Messenger Bot providing smooth multi-sign paying experience.
 

README.md

@@ -13,6 +13,7 @@
 #  signer_uuids        :uuid             default("{}"), is an Array
 #  status              :string
 #  threshold           :integer
+#  transaction_hash    :string
 #  created_at          :datetime         not null
 #  updated_at          :datetime         not null
 #  asset_id            :uuid
@@ -24,6 +25,7 @@
 #  index_multisig_transactions_on_multisig_account_id  (multisig_account_id)
 #  index_multisig_transactions_on_receiver_uuids       (receiver_uuids)
 #  index_multisig_transactions_on_sender_uuids         (sender_uuids)
+#  index_multisig_transactions_on_transaction_hash     (transaction_hash)
 #  index_multisig_transactions_on_user_id              (user_id)
 #
 class MultisigTransaction < ApplicationRecord

app/models/multisig_transaction.rb

@@ -105,7 +105,7 @@
   command %(journalctl -f -u sidekiq)
 end
 
-desc 'Precompile locally'
+desc 'Rsync precompiled assets from local to remote /temp'
 task :rsync_packs_from_local_to_tmp do
   run :local do
     command %(echo "-----> rsync public/assets to #{fetch(:tmp_path)}/public/assets")
@@ -116,7 +116,7 @@
   end
 end
 
-desc 'Rsync packs from tmp'
+desc 'Rsync packs from /tmp to /current'
 task :rsync_from_tmp_to_current do
   command %(echo "-----> rsync #{fetch(:tmp_path)}/public/assets/ to #{fetch(:current_path)}/public/assets")
   command %(rsync #{fetch(:tmp_path)}/public/assets/ #{fetch(:current_path)}/public/assets/)
@@ -125,7 +125,6 @@
   command %(rsync #{fetch(:tmp_path)}/public/packs/ #{fetch(:current_path)}/public/packs/)
 end
 
-
 desc 'Deploys the current version to the server.'
 task :deploy do
   # uncomment this line to make sure you pushed your local branch to the remote origin

bin/exp renamed to bin/deploy

@@ -11,7 +11,7 @@ default: &default
 
   # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
-  resolved_paths: []
+  resolved_paths: ['app/assets']
 
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
@@ -59,7 +59,7 @@ development:
   check_yarn_integrity: true
 
   # Compile development packs to a separate directory
-  public_output_path: packs-dev
+  # public_output_path: packs-dev
 
   # Reference: https://webpack.js.org/configuration/dev-server/
   dev_server: