From fde01c95fe475b0b0eee1112146778b2819a7a58 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Mon, 23 Oct 2023 15:24:39 -0400 Subject: [PATCH 01/54] add nodejs github action for automated build and testing --- .github/workflows/node.js.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/node.js.yml diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml new file mode 100644 index 00000000..d81991fb --- /dev/null +++ b/.github/workflows/node.js.yml @@ -0,0 +1,31 @@ +# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs + +name: Node.js CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [14.x, 16.x, 18.x] + # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + + steps: + - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + cache: 'npm' + - run: npm ci + - run: npm run build + - run: npm test From e49bb835ddb9f17eb11e077e0ebc410f1b06c60b Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Mon, 23 Oct 2023 15:35:39 -0400 Subject: [PATCH 02/54] only test node versions 18.x and 20.x --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index d81991fb..aa9a4413 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - node-version: [14.x, 16.x, 18.x] + node-version: [18.x, 20.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: From 1206a69c2510f77a2621f5f165967716837db765 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Mon, 23 Oct 2023 15:48:38 -0400 Subject: [PATCH 03/54] start mysql service (ubuntu comes with it) --- .github/workflows/node.js.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index aa9a4413..eeeccf41 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -20,6 +20,9 @@ jobs: # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: + - name: Set up MySQL + run: | + sudo /etc/init.d/mysql start - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 From 9327fd27a8f647b898a30bbf3a257bbeb5ac5b1e Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Mon, 23 Oct 2023 15:54:58 -0400 Subject: [PATCH 04/54] temporarily change config value to default mysql root password --- config/test_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/test_config.json b/config/test_config.json index 89eed41c..240ac2ca 100644 --- a/config/test_config.json +++ b/config/test_config.json @@ -16,7 +16,7 @@ "supportBigNumbers": true, "database" : "nmig_test_db", "user" : "root", - "password" : "0123456789" + "password" : "" }, "target_description" : [ From 908618b2aa7f3875fae34f5784dea7ac759b5c1a Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Mon, 23 Oct 2023 16:09:42 -0400 Subject: [PATCH 05/54] try establishing root password during setup --- .github/workflows/node.js.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index eeeccf41..3c28a0e7 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -23,6 +23,7 @@ jobs: - name: Set up MySQL run: | sudo /etc/init.d/mysql start + mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '0123456789'" - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 From 6ef255c31a5dc4211fb3aae476a2917406e2eba3 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Mon, 23 Oct 2023 16:10:08 -0400 Subject: [PATCH 06/54] Revert "temporarily change config value to default mysql root password" This reverts commit 9327fd27a8f647b898a30bbf3a257bbeb5ac5b1e. --- config/test_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/test_config.json b/config/test_config.json index 240ac2ca..89eed41c 100644 --- a/config/test_config.json +++ b/config/test_config.json @@ -16,7 +16,7 @@ "supportBigNumbers": true, "database" : "nmig_test_db", "user" : "root", - "password" : "" + "password" : "0123456789" }, "target_description" : [ From 5401710ea2cb6f30dd1c8814fc29dd9685ebcf48 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Mon, 23 Oct 2023 16:11:47 -0400 Subject: [PATCH 07/54] login to mysql as root --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 3c28a0e7..dd5e1075 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -23,7 +23,7 @@ jobs: - name: Set up MySQL run: | sudo /etc/init.d/mysql start - mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '0123456789'" + mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '0123456789'" -u root - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 From a6a912dd9f713679c5985452550d6daec83e11cc Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Mon, 23 Oct 2023 16:18:15 -0400 Subject: [PATCH 08/54] try root pw --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index dd5e1075..bb550e90 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -23,7 +23,7 @@ jobs: - name: Set up MySQL run: | sudo /etc/init.d/mysql start - mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '0123456789'" -u root + mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '0123456789'" -u root -p root - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 From afecce353906aa0da21f1ae1df90c285ab95b2c8 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Mon, 23 Oct 2023 16:23:52 -0400 Subject: [PATCH 09/54] it can't be --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index bb550e90..e2c028b6 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -23,7 +23,7 @@ jobs: - name: Set up MySQL run: | sudo /etc/init.d/mysql start - mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '0123456789'" -u root -p root + mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '0123456789'" -uroot -proot - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 From 218c48ceeeed05f8034b75a672811b80ada6700d Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 12:31:57 -0400 Subject: [PATCH 10/54] add postgres service --- .github/workflows/node.js.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index e2c028b6..715a2e33 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -19,6 +19,12 @@ jobs: node-version: [18.x, 20.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + services: + postgres: + image: postgres:16 + env: + POSTGRES_PASSWORD: postgres + steps: - name: Set up MySQL run: | From 09abab6cead2be283de4ba8d364f249162e5d33b Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 12:35:03 -0400 Subject: [PATCH 11/54] only run one version of node right now, change postgres pw --- .github/workflows/node.js.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 715a2e33..e0877570 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -16,14 +16,15 @@ jobs: strategy: matrix: - node-version: [18.x, 20.x] + node-version: [18.x] + # [18.x, 20.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ services: postgres: image: postgres:16 env: - POSTGRES_PASSWORD: postgres + POSTGRES_PASSWORD: 0123456789 steps: - name: Set up MySQL From be8fe6f9abeddaa973123889b374cb4f69a5d9b6 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 12:39:56 -0400 Subject: [PATCH 12/54] set password with correct var --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index e0877570..956573e0 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -24,7 +24,7 @@ jobs: postgres: image: postgres:16 env: - POSTGRES_PASSWORD: 0123456789 + PGPASSWORD: 0123456789 steps: - name: Set up MySQL From 578d3baf647fc13f40a1bf1376b1ec4f92abec01 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 15:40:35 -0400 Subject: [PATCH 13/54] POSTGRES_PASSWORD is required, also add port mapping --- .github/workflows/node.js.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 956573e0..ba52a89b 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -24,7 +24,10 @@ jobs: postgres: image: postgres:16 env: - PGPASSWORD: 0123456789 + POSTGRES_PASSWORD: 0123456789 + POSTGRES_USER: postgres + ports: + - 5432:5432 steps: - name: Set up MySQL From d4b0462407da76ef79772e23249a7c5bde53fa18 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 15:50:37 -0400 Subject: [PATCH 14/54] test connection with a step --- .github/workflows/node.js.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index ba52a89b..3f93cae1 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -30,6 +30,8 @@ jobs: - 5432:5432 steps: + - name: test postgres connection + - run: PGPASSWORD='0123456789' psql -l -U postgres - name: Set up MySQL run: | sudo /etc/init.d/mysql start From fbdb4b94e4f6d27a316773adb3160a54aa1417f5 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 15:52:08 -0400 Subject: [PATCH 15/54] gh action syntax... --- .github/workflows/node.js.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 3f93cae1..fcb97e69 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -30,7 +30,6 @@ jobs: - 5432:5432 steps: - - name: test postgres connection - run: PGPASSWORD='0123456789' psql -l -U postgres - name: Set up MySQL run: | From 441dc15e24308287104ddd95aa2ec5468d8198e6 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 15:53:44 -0400 Subject: [PATCH 16/54] define host --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index fcb97e69..09a691f3 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -30,7 +30,7 @@ jobs: - 5432:5432 steps: - - run: PGPASSWORD='0123456789' psql -l -U postgres + - run: PGPASSWORD='0123456789' psql -l -U postgres -h 127.0.0.1 -p 5432 - name: Set up MySQL run: | sudo /etc/init.d/mysql start From 6bf312fc07bb685e0c35092436cda68d0d184885 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 15:55:06 -0400 Subject: [PATCH 17/54] try localhost.... --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 09a691f3..78b3d5df 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -30,7 +30,7 @@ jobs: - 5432:5432 steps: - - run: PGPASSWORD='0123456789' psql -l -U postgres -h 127.0.0.1 -p 5432 + - run: PGPASSWORD='0123456789' psql -l -U postgres -h localhost -p 5432 - name: Set up MySQL run: | sudo /etc/init.d/mysql start From 74d1c428d69659150f87514717aa2c02bcdc5d97 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 17:31:15 -0400 Subject: [PATCH 18/54] host postgres? --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 78b3d5df..4b284ce5 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -30,7 +30,7 @@ jobs: - 5432:5432 steps: - - run: PGPASSWORD='0123456789' psql -l -U postgres -h localhost -p 5432 + - run: PGPASSWORD='0123456789' psql -l -U postgres -h postgres -p 5432 - name: Set up MySQL run: | sudo /etc/init.d/mysql start From 2f523f1a15c58016f469bcace9acdc92e6394a9d Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 17:33:31 -0400 Subject: [PATCH 19/54] add some health checks --- .github/workflows/node.js.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 4b284ce5..f760e1cb 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -26,11 +26,16 @@ jobs: env: POSTGRES_PASSWORD: 0123456789 POSTGRES_USER: postgres + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 ports: - 5432:5432 steps: - - run: PGPASSWORD='0123456789' psql -l -U postgres -h postgres -p 5432 + - run: PGPASSWORD='0123456789' psql -l -U postgres -h localhost -p 5432 - name: Set up MySQL run: | sudo /etc/init.d/mysql start From f49edea3d36420a88c8820832e8bc737611daacc Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 17:38:20 -0400 Subject: [PATCH 20/54] did healthcheck fix problem --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index f760e1cb..d6470ac1 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -35,7 +35,7 @@ jobs: - 5432:5432 steps: - - run: PGPASSWORD='0123456789' psql -l -U postgres -h localhost -p 5432 + #- run: PGPASSWORD='0123456789' psql -l -U postgres -h localhost -p 5432 - name: Set up MySQL run: | sudo /etc/init.d/mysql start From f0e6067c7b5b2d4c5bf2a2c42ca767accb487d17 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 18:42:42 -0400 Subject: [PATCH 21/54] just trying things --- .github/workflows/node.js.yml | 4 ++-- config/test_config.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index d6470ac1..c2bad480 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -25,7 +25,7 @@ jobs: image: postgres:16 env: POSTGRES_PASSWORD: 0123456789 - POSTGRES_USER: postgres + #POSTGRES_USER: postgres options: >- --health-cmd pg_isready --health-interval 10s @@ -35,7 +35,7 @@ jobs: - 5432:5432 steps: - #- run: PGPASSWORD='0123456789' psql -l -U postgres -h localhost -p 5432 + - run: PGPASSWORD=0123456789 psql -l -U postgres -h localhost -p 5432 - name: Set up MySQL run: | sudo /etc/init.d/mysql start diff --git a/config/test_config.json b/config/test_config.json index 89eed41c..095ab05e 100644 --- a/config/test_config.json +++ b/config/test_config.json @@ -26,7 +26,7 @@ "Notice, any parameter, acceptable by the node pg module can be placed here." ], "target" : { - "host" : "127.0.0.1", + "host" : "localhost", "port" : 5432, "charset" : "UTF8", "database" : "nmig_test_db", From e34e17fb69e3709f06e4f48d9110380e519dfa6a Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 18:46:07 -0400 Subject: [PATCH 22/54] add continue-on-error, try another command --- .github/workflows/node.js.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index c2bad480..b0b842b2 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -35,7 +35,12 @@ jobs: - 5432:5432 steps: - - run: PGPASSWORD=0123456789 psql -l -U postgres -h localhost -p 5432 + - name: try to log into postgres + run: | + PGPASSWORD=0123456789 psql -l -h localhost -p 5432 + psql -l -U postgres -h localhost -p 5432 + continue-on-error: true + - name: Set up MySQL run: | sudo /etc/init.d/mysql start From 211e95e4c910c18150379531b798467cba546b01 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 18:49:41 -0400 Subject: [PATCH 23/54] break out cmd, make sure we're using strings --- .github/workflows/node.js.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index b0b842b2..00bd3bc7 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -24,7 +24,7 @@ jobs: postgres: image: postgres:16 env: - POSTGRES_PASSWORD: 0123456789 + POSTGRES_PASSWORD: '0123456789' #POSTGRES_USER: postgres options: >- --health-cmd pg_isready @@ -37,7 +37,11 @@ jobs: steps: - name: try to log into postgres run: | - PGPASSWORD=0123456789 psql -l -h localhost -p 5432 + PGPASSWORD='0123456789' psql -l -h localhost -p 5432 + continue-on-error: true + + - name: try to log into postgres 2 + run: | psql -l -U postgres -h localhost -p 5432 continue-on-error: true From e1e8aed4b87f1cb56f8508851a5719a1ce1341eb Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 18:52:00 -0400 Subject: [PATCH 24/54] try with postgres user --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 00bd3bc7..8a3c6284 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -37,7 +37,7 @@ jobs: steps: - name: try to log into postgres run: | - PGPASSWORD='0123456789' psql -l -h localhost -p 5432 + PGPASSWORD='0123456789' psql -l -h localhost -U postgres -p 5432 continue-on-error: true - name: try to log into postgres 2 From ff459f9d974b69fbfe5c71067bf9c5e4f9dc7526 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 18:54:50 -0400 Subject: [PATCH 25/54] rename test output, create default db --- .github/workflows/node.js.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 8a3c6284..4f3504e8 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -25,7 +25,7 @@ jobs: image: postgres:16 env: POSTGRES_PASSWORD: '0123456789' - #POSTGRES_USER: postgres + POSTGRES_DB: nmig_test_db options: >- --health-cmd pg_isready --health-interval 10s @@ -35,16 +35,11 @@ jobs: - 5432:5432 steps: - - name: try to log into postgres + - name: get postgres tables run: | PGPASSWORD='0123456789' psql -l -h localhost -U postgres -p 5432 continue-on-error: true - - name: try to log into postgres 2 - run: | - psql -l -U postgres -h localhost -p 5432 - continue-on-error: true - - name: Set up MySQL run: | sudo /etc/init.d/mysql start From 32e6e5d4bcbd25d2e8de88112ebd5b5e2b34fdf4 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 18:58:36 -0400 Subject: [PATCH 26/54] drop public schema before test --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 4f3504e8..e0e4083c 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -37,7 +37,7 @@ jobs: steps: - name: get postgres tables run: | - PGPASSWORD='0123456789' psql -l -h localhost -U postgres -p 5432 + PGPASSWORD='0123456789' psql -c 'DROP SCHEMA nmig_test_db.public' -h localhost -U postgres -p 5432 continue-on-error: true - name: Set up MySQL From 7980c5d6a2d4390c57faf0f675d17b2a4140cf7c Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:00:39 -0400 Subject: [PATCH 27/54] wrap schema with double quotes --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index e0e4083c..8873db96 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -37,7 +37,7 @@ jobs: steps: - name: get postgres tables run: | - PGPASSWORD='0123456789' psql -c 'DROP SCHEMA nmig_test_db.public' -h localhost -U postgres -p 5432 + PGPASSWORD='0123456789' psql -c 'DROP SCHEMA "nmig_test_db.public"' -h localhost -U postgres -p 5432 continue-on-error: true - name: Set up MySQL From d9862ca58e1f8f01a68e1ea81ad3ce2f4f081829 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:08:05 -0400 Subject: [PATCH 28/54] this does not work like i thought it did --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 8873db96..ce316f69 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -37,7 +37,7 @@ jobs: steps: - name: get postgres tables run: | - PGPASSWORD='0123456789' psql -c 'DROP SCHEMA "nmig_test_db.public"' -h localhost -U postgres -p 5432 + PGPASSWORD='0123456789' psql -c 'DROP SCHEMA public' -d nmig_test_db -h localhost -U postgres -p 5432 continue-on-error: true - name: Set up MySQL From 19f534fc58410fc21133adb418f9f45952ca8b08 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:12:10 -0400 Subject: [PATCH 29/54] bettername for step, can we get away without port? --- .github/workflows/node.js.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index ce316f69..a5e68271 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -35,11 +35,9 @@ jobs: - 5432:5432 steps: - - name: get postgres tables + - name: Configure Postgres table run: | - PGPASSWORD='0123456789' psql -c 'DROP SCHEMA public' -d nmig_test_db -h localhost -U postgres -p 5432 - continue-on-error: true - + PGPASSWORD='0123456789' psql -c 'DROP SCHEMA public' -d nmig_test_db -h localhost -U postgres - name: Set up MySQL run: | sudo /etc/init.d/mysql start From 30f167268ab8f548a9d8da076e9fdad2939502ec Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:19:17 -0400 Subject: [PATCH 30/54] can we get away without port mapping --- .github/workflows/node.js.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index a5e68271..0d1f684a 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -31,8 +31,6 @@ jobs: --health-interval 10s --health-timeout 5s --health-retries 5 - ports: - - 5432:5432 steps: - name: Configure Postgres table From 7f60da2624c966ed6d728876ab8958dbbdf8f884 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:21:37 -0400 Subject: [PATCH 31/54] can we live without host? --- .github/workflows/node.js.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 0d1f684a..bae46915 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -31,11 +31,13 @@ jobs: --health-interval 10s --health-timeout 5s --health-retries 5 + ports: + - 5432:5432 steps: - name: Configure Postgres table run: | - PGPASSWORD='0123456789' psql -c 'DROP SCHEMA public' -d nmig_test_db -h localhost -U postgres + PGPASSWORD='0123456789' psql -c 'DROP SCHEMA public' -d nmig_test_db -U postgres - name: Set up MySQL run: | sudo /etc/init.d/mysql start From eb7f42bdcc03597efdcddf1cc45ab1b606d507c3 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:23:32 -0400 Subject: [PATCH 32/54] Revert "can we live without host?" no. This reverts commit 7f60da2624c966ed6d728876ab8958dbbdf8f884. --- .github/workflows/node.js.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index bae46915..0d1f684a 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -31,13 +31,11 @@ jobs: --health-interval 10s --health-timeout 5s --health-retries 5 - ports: - - 5432:5432 steps: - name: Configure Postgres table run: | - PGPASSWORD='0123456789' psql -c 'DROP SCHEMA public' -d nmig_test_db -U postgres + PGPASSWORD='0123456789' psql -c 'DROP SCHEMA public' -d nmig_test_db -h localhost -U postgres - name: Set up MySQL run: | sudo /etc/init.d/mysql start From 69156f1b17d05a002f44a97d5135564a833729ef Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:28:45 -0400 Subject: [PATCH 33/54] use clearer syntax --- .github/workflows/node.js.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 0d1f684a..8fd4742c 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -34,8 +34,12 @@ jobs: steps: - name: Configure Postgres table - run: | - PGPASSWORD='0123456789' psql -c 'DROP SCHEMA public' -d nmig_test_db -h localhost -U postgres + run: >- + PGPASSWORD='0123456789' + psql -c 'DROP SCHEMA public' + -d nmig_test_db + -h localhost + -U postgres - name: Set up MySQL run: | sudo /etc/init.d/mysql start From e7fe3e3e6797fab6de75fd0e4ea2e0dbe3a33bf0 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:33:23 -0400 Subject: [PATCH 34/54] accidentally deleted this --- .github/workflows/node.js.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 8fd4742c..86793314 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -31,6 +31,8 @@ jobs: --health-interval 10s --health-timeout 5s --health-retries 5 + ports: + - 5432:5432 steps: - name: Configure Postgres table From 165a243e39a65756bbd320031a7a89f84970553f Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:36:11 -0400 Subject: [PATCH 35/54] change value to check that tests fail --- test/TestModules/DataContentTest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/TestModules/DataContentTest.ts b/test/TestModules/DataContentTest.ts index a448ce75..06d881bf 100644 --- a/test/TestModules/DataContentTest.ts +++ b/test/TestModules/DataContentTest.ts @@ -95,7 +95,7 @@ export default async (testSchemaProcessor: TestSchemaProcessor, tape: Test): Pro tape.equal(JSON.stringify(data.json_test_comment), '{"prop1":"First","prop2":2}'); tape.comment('Test year column value'); - tape.equal(data.year, 1984); + tape.equal(data.year, 1985); tape.comment('Test bigint column value'); tape.equal(data.bigint, '9223372036854775807'); From 623c0fb04ea42370bb30a2fe615a695e0b6c3495 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:38:29 -0400 Subject: [PATCH 36/54] Revert "change value to check that tests fail" works. This reverts commit 165a243e39a65756bbd320031a7a89f84970553f. --- test/TestModules/DataContentTest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/TestModules/DataContentTest.ts b/test/TestModules/DataContentTest.ts index 06d881bf..a448ce75 100644 --- a/test/TestModules/DataContentTest.ts +++ b/test/TestModules/DataContentTest.ts @@ -95,7 +95,7 @@ export default async (testSchemaProcessor: TestSchemaProcessor, tape: Test): Pro tape.equal(JSON.stringify(data.json_test_comment), '{"prop1":"First","prop2":2}'); tape.comment('Test year column value'); - tape.equal(data.year, 1985); + tape.equal(data.year, 1984); tape.comment('Test bigint column value'); tape.equal(data.bigint, '9223372036854775807'); From f5a2087976c313cc53669bd7dfaaab9f407e26c3 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:43:05 -0400 Subject: [PATCH 37/54] use env key --- .github/workflows/node.js.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 86793314..bf456638 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -37,11 +37,12 @@ jobs: steps: - name: Configure Postgres table run: >- - PGPASSWORD='0123456789' psql -c 'DROP SCHEMA public' -d nmig_test_db -h localhost -U postgres + env: + PGPASSWORD: 0123456789 - name: Set up MySQL run: | sudo /etc/init.d/mysql start From 4d357401a0fdd79a05bbb8a8443d6a97b1c62b95 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:44:18 -0400 Subject: [PATCH 38/54] eh? --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index bf456638..7e4f0198 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -42,7 +42,7 @@ jobs: -h localhost -U postgres env: - PGPASSWORD: 0123456789 + PGPASSWORD: '0123456789' - name: Set up MySQL run: | sudo /etc/init.d/mysql start From 9cdc94425286ffd12afc44e4e4e481344bdd846f Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:49:08 -0400 Subject: [PATCH 39/54] can use vars like this? --- .github/workflows/node.js.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 7e4f0198..f0c7fe8f 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -9,6 +9,9 @@ on: pull_request: branches: [ "master" ] +env: + PG_DB_NAME: nmig_test_db + jobs: build: @@ -25,7 +28,7 @@ jobs: image: postgres:16 env: POSTGRES_PASSWORD: '0123456789' - POSTGRES_DB: nmig_test_db + POSTGRES_DB: $PG_DB_NAME options: >- --health-cmd pg_isready --health-interval 10s From 4f962f51f06201c538058cf673752ae3ace47779 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:52:18 -0400 Subject: [PATCH 40/54] shot in the dark --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index f0c7fe8f..013ed758 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -28,7 +28,7 @@ jobs: image: postgres:16 env: POSTGRES_PASSWORD: '0123456789' - POSTGRES_DB: $PG_DB_NAME + POSTGRES_DB: "$PG_DB_NAME" options: >- --health-cmd pg_isready --health-interval 10s From cb7f7e244a12f69af9bec99d2e410478e3b1dd7a Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 19:54:50 -0400 Subject: [PATCH 41/54] nope, won't work --- .github/workflows/node.js.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 013ed758..7e4f0198 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -9,9 +9,6 @@ on: pull_request: branches: [ "master" ] -env: - PG_DB_NAME: nmig_test_db - jobs: build: @@ -28,7 +25,7 @@ jobs: image: postgres:16 env: POSTGRES_PASSWORD: '0123456789' - POSTGRES_DB: "$PG_DB_NAME" + POSTGRES_DB: nmig_test_db options: >- --health-cmd pg_isready --health-interval 10s From 37a6ff31fc8128d51204a692b9c379701e30cf52 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 20:01:09 -0400 Subject: [PATCH 42/54] change order of keys, better name for mysql step --- .github/workflows/node.js.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 7e4f0198..681700c5 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -36,14 +36,14 @@ jobs: steps: - name: Configure Postgres table + env: + PGPASSWORD: '0123456789' run: >- psql -c 'DROP SCHEMA public' -d nmig_test_db -h localhost -U postgres - env: - PGPASSWORD: '0123456789' - - name: Set up MySQL + - name: Start MySQL server and set root password run: | sudo /etc/init.d/mysql start mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '0123456789'" -uroot -proot From a18feed4edf98abefa0c3b77ad038da2fb14a462 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 20:02:26 -0400 Subject: [PATCH 43/54] try this way of accessing env var --- .github/workflows/node.js.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 681700c5..297346f0 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -9,6 +9,9 @@ on: pull_request: branches: [ "master" ] +env: + PG_TEST_DB_NAME: nmig_test_db + jobs: build: @@ -25,7 +28,7 @@ jobs: image: postgres:16 env: POSTGRES_PASSWORD: '0123456789' - POSTGRES_DB: nmig_test_db + POSTGRES_DB: ${{ env.PG_TEST_DB_NAME }} options: >- --health-cmd pg_isready --health-interval 10s From 9de2f60f567983fd7d73935001768c6f6e308a94 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 20:05:35 -0400 Subject: [PATCH 44/54] use top-level env vars more --- .github/workflows/node.js.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 297346f0..e5baf9ab 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -11,6 +11,7 @@ on: env: PG_TEST_DB_NAME: nmig_test_db + DB_PASSWORD: '0123456789' jobs: build: @@ -27,7 +28,7 @@ jobs: postgres: image: postgres:16 env: - POSTGRES_PASSWORD: '0123456789' + POSTGRES_PASSWORD: ${{ env.DB_PASSWORD }} POSTGRES_DB: ${{ env.PG_TEST_DB_NAME }} options: >- --health-cmd pg_isready @@ -40,10 +41,10 @@ jobs: steps: - name: Configure Postgres table env: - PGPASSWORD: '0123456789' + PGPASSWORD: ${{ env.DB_PASSWORD }} run: >- psql -c 'DROP SCHEMA public' - -d nmig_test_db + -d ${{ env.PG_TEST_DB_NAME }} -h localhost -U postgres - name: Start MySQL server and set root password From f4777efd9b9c11719def1880c4f3079b90026a51 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 20:07:41 -0400 Subject: [PATCH 45/54] more env var use --- .github/workflows/node.js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index e5baf9ab..aada2335 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -44,13 +44,13 @@ jobs: PGPASSWORD: ${{ env.DB_PASSWORD }} run: >- psql -c 'DROP SCHEMA public' - -d ${{ env.PG_TEST_DB_NAME }} + -d $PG_TEST_DB_NAME -h localhost -U postgres - name: Start MySQL server and set root password run: | sudo /etc/init.d/mysql start - mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '0123456789'" -uroot -proot + mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY $DB_PASSWORD" -uroot -proot - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 From 328cbbaa285118ce6a624f9998994dbee9c9d095 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 20:14:41 -0400 Subject: [PATCH 46/54] quotes --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index aada2335..add68060 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -50,7 +50,7 @@ jobs: - name: Start MySQL server and set root password run: | sudo /etc/init.d/mysql start - mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY $DB_PASSWORD" -uroot -proot + mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '$DB_PASSWORD'" -uroot -proot - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 From a9c6607f3bbf26535592b8af92a17f2e94674e46 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 20:19:21 -0400 Subject: [PATCH 47/54] use 2 node versions, use latest postgres image --- .github/workflows/node.js.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index add68060..e11db2bd 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -20,13 +20,11 @@ jobs: strategy: matrix: - node-version: [18.x] - # [18.x, 20.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + node-version: [18.x, 20.x] services: postgres: - image: postgres:16 + image: postgres env: POSTGRES_PASSWORD: ${{ env.DB_PASSWORD }} POSTGRES_DB: ${{ env.PG_TEST_DB_NAME }} From deb34e0963e0661247d1da5c959c132eba2d3dd1 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 20:20:21 -0400 Subject: [PATCH 48/54] try building docker image? --- .github/workflows/node.js.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index e11db2bd..3b84f125 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -58,3 +58,4 @@ jobs: - run: npm ci - run: npm run build - run: npm test + - run: docker build --tag nmig . From f1a556130d0aa18cd3a14401cfb837dde84a0cae Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Tue, 24 Oct 2023 20:25:00 -0400 Subject: [PATCH 49/54] Revert "try building docker image?" This reverts commit deb34e0963e0661247d1da5c959c132eba2d3dd1. --- .github/workflows/node.js.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 3b84f125..e11db2bd 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -58,4 +58,3 @@ jobs: - run: npm ci - run: npm run build - run: npm test - - run: docker build --tag nmig . From d4eb28d9d6540b7eae48e6b6650b8f1a225ada07 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Wed, 25 Oct 2023 14:38:41 -0400 Subject: [PATCH 50/54] see if this works without options --- .github/workflows/node.js.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index e11db2bd..cf72fb0f 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -28,11 +28,6 @@ jobs: env: POSTGRES_PASSWORD: ${{ env.DB_PASSWORD }} POSTGRES_DB: ${{ env.PG_TEST_DB_NAME }} - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 5 ports: - 5432:5432 From 2154145870208c91ce2984d5f9ca477a5a6fece0 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Wed, 25 Oct 2023 15:35:32 -0400 Subject: [PATCH 51/54] Revert "see if this works without options" This reverts commit d4eb28d9d6540b7eae48e6b6650b8f1a225ada07. --- .github/workflows/node.js.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index cf72fb0f..e11db2bd 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -28,6 +28,11 @@ jobs: env: POSTGRES_PASSWORD: ${{ env.DB_PASSWORD }} POSTGRES_DB: ${{ env.PG_TEST_DB_NAME }} + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 ports: - 5432:5432 From 035de926aef8141b2beaa7c9925736acaa8e13cd Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Mon, 13 Nov 2023 16:48:35 +0100 Subject: [PATCH 52/54] clean up github action file, reorder some steps, update and add labels --- .github/workflows/node.js.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index e11db2bd..e81e09fd 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -1,7 +1,7 @@ # This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs -name: Node.js CI +name: Build and test with Node.js on: push: @@ -15,7 +15,6 @@ env: jobs: build: - runs-on: ubuntu-latest strategy: @@ -37,6 +36,15 @@ jobs: - 5432:5432 steps: + - name: Check out repository + uses: actions/checkout@v3 + + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + cache: 'npm' + - name: Configure Postgres table env: PGPASSWORD: ${{ env.DB_PASSWORD }} @@ -45,16 +53,12 @@ jobs: -d $PG_TEST_DB_NAME -h localhost -U postgres + - name: Start MySQL server and set root password run: | sudo /etc/init.d/mysql start mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '$DB_PASSWORD'" -uroot -proot - - uses: actions/checkout@v3 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - cache: 'npm' + - run: npm ci - run: npm run build - run: npm test From 153b8f2fd119ea14a44ef83e1b95d74fa7c80567 Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Mon, 13 Nov 2023 16:56:21 +0100 Subject: [PATCH 53/54] maybe we don't have to do this --- config/test_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/test_config.json b/config/test_config.json index 095ab05e..89eed41c 100644 --- a/config/test_config.json +++ b/config/test_config.json @@ -26,7 +26,7 @@ "Notice, any parameter, acceptable by the node pg module can be placed here." ], "target" : { - "host" : "localhost", + "host" : "127.0.0.1", "port" : 5432, "charset" : "UTF8", "database" : "nmig_test_db", From a864c2d5fe2dd92e65ace8990ee580988f2effbf Mon Sep 17 00:00:00 2001 From: Adrian Parsons Date: Mon, 13 Nov 2023 17:07:57 +0100 Subject: [PATCH 54/54] clean up env var names --- .github/workflows/node.js.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index e81e09fd..969dae36 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -10,7 +10,7 @@ on: branches: [ "master" ] env: - PG_TEST_DB_NAME: nmig_test_db + DB_NAME: nmig_test_db DB_PASSWORD: '0123456789' jobs: @@ -26,7 +26,7 @@ jobs: image: postgres env: POSTGRES_PASSWORD: ${{ env.DB_PASSWORD }} - POSTGRES_DB: ${{ env.PG_TEST_DB_NAME }} + POSTGRES_DB: ${{ env.DB_NAME }} options: >- --health-cmd pg_isready --health-interval 10s @@ -50,7 +50,7 @@ jobs: PGPASSWORD: ${{ env.DB_PASSWORD }} run: >- psql -c 'DROP SCHEMA public' - -d $PG_TEST_DB_NAME + -d $DB_NAME -h localhost -U postgres