From 5d9b86c42d6cc40da3d4321861333ff1d44d8ff7 Mon Sep 17 00:00:00 2001 From: Antti Holvikari Date: Sat, 23 Sep 2023 16:01:02 +0300 Subject: [PATCH 1/9] Add initial CI config --- .github/workflows/ci.yml | 12 +++++------- package.json | 11 ++++------- spago.yaml | 13 +++++++++++++ 3 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 spago.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70427e62..41c5cd35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,18 +15,16 @@ jobs: - uses: actions/setup-node@v1 with: - node-version: "12" + node-version: "18" - name: Install dependencies run: | - npm install -g bower - npm install - bower install --production + apt install chezscheme + npm install spago@next - name: Build source - run: npm run-script build + run: npm run build - name: Run tests run: | - bower install - npm run-script test --if-present + npm run test diff --git a/package.json b/package.json index 3ed6897b..1eaa5b83 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,11 @@ { "private": true, "scripts": { - "clean": "rimraf output && rimraf .pulp-cache", - "build": "eslint src && pulp build -- --censor-lib --strict", - "test": "pulp test" + "build": "spago build", + "test": "spago build && purescm bundle-app --main Test.Main && scheme --program output/main" }, "devDependencies": { - "eslint": "^7.15.0", - "purescript-psa": "^0.8.0", - "pulp": "^15.0.0", - "rimraf": "^3.0.2" + "purescm": "1.0.0", + "purescript-psa": "^0.8.0" } } diff --git a/spago.yaml b/spago.yaml new file mode 100644 index 00000000..d5f782b9 --- /dev/null +++ b/spago.yaml @@ -0,0 +1,13 @@ +package: + name: purescm + dependencies: [] + test: + main: Test.Main + dependencies: [] +workspace: + package_set: + registry: 41.2.0 + backend: + cmd: purescm + args: + - "build" From ce993adec8765c369a22b0c0fb8b647ce0b112cc Mon Sep 17 00:00:00 2001 From: Antti Holvikari Date: Sat, 23 Sep 2023 16:04:37 +0300 Subject: [PATCH 2/9] Use sudo --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41c5cd35..c448c288 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - name: Install dependencies run: | - apt install chezscheme + sudo apt install chezscheme npm install spago@next - name: Build source From 126f0c3b24f7f17ba1afd02379c908fe394bc6c3 Mon Sep 17 00:00:00 2001 From: Antti Holvikari Date: Sat, 23 Sep 2023 16:11:07 +0300 Subject: [PATCH 3/9] Install correct purs version --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c448c288..7f634f5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,8 +11,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: purescript-contrib/setup-purescript@main - - uses: actions/setup-node@v1 with: node-version: "18" @@ -20,7 +18,9 @@ jobs: - name: Install dependencies run: | sudo apt install chezscheme - npm install spago@next + + - name: Setup PureScript dependencies + run: npm i --global purescript@0.15.10 purs-tidy@latest spago@latest purescript-psa@latest - name: Build source run: npm run build From 750e851ca660d24d7af59f8b3ff874dcb1561fc9 Mon Sep 17 00:00:00 2001 From: Antti Holvikari Date: Sat, 23 Sep 2023 16:12:19 +0300 Subject: [PATCH 4/9] Fix spago version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f634f5d..bffaa98c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: sudo apt install chezscheme - name: Setup PureScript dependencies - run: npm i --global purescript@0.15.10 purs-tidy@latest spago@latest purescript-psa@latest + run: npm i --global purescript@0.15.10 purs-tidy@latest spago@next purescript-psa@latest - name: Build source run: npm run build From 3cb840c1552761fa2268f96a8d283dab2f51d773 Mon Sep 17 00:00:00 2001 From: Antti Holvikari Date: Sat, 23 Sep 2023 16:35:42 +0300 Subject: [PATCH 5/9] Install purescm --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bffaa98c..aa86e88a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: sudo apt install chezscheme - name: Setup PureScript dependencies - run: npm i --global purescript@0.15.10 purs-tidy@latest spago@next purescript-psa@latest + run: npm i --global purescript@0.15.10 purs-tidy@latest spago@next purescript-psa@latest purescm@next - name: Build source run: npm run build From 72a25615db6c93a01fbc4229cd17048a275e9486 Mon Sep 17 00:00:00 2001 From: Antti Holvikari Date: Sat, 23 Sep 2023 21:56:46 +0300 Subject: [PATCH 6/9] Remove psa from deps --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 1eaa5b83..dbd20f8a 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,6 @@ "test": "spago build && purescm bundle-app --main Test.Main && scheme --program output/main" }, "devDependencies": { - "purescm": "1.0.0", - "purescript-psa": "^0.8.0" + "purescm": "1.0.0" } } From cd9b5f84606d52707907457ed5d0523a7468ffe0 Mon Sep 17 00:00:00 2001 From: Antti Holvikari Date: Sat, 23 Sep 2023 22:32:07 +0300 Subject: [PATCH 7/9] Cache PS deps --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa86e88a..90b0bfe2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,14 @@ jobs: - name: Build source run: npm run build + - name: Cache PureScript dependencies + uses: actions/cache@v2 + with: + key: ${{ runner.os }}-spago-${{ hashFiles('**/spago.yaml') }} + path: | + .spago + output + - name: Run tests run: | npm run test From 5ef987a144a68478d1cad70008ad213caffd116a Mon Sep 17 00:00:00 2001 From: Antti Holvikari Date: Sat, 23 Sep 2023 22:37:02 +0300 Subject: [PATCH 8/9] Update deps --- .github/workflows/ci.yml | 2 +- package.json | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90b0bfe2..0d52a11b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: sudo apt install chezscheme - name: Setup PureScript dependencies - run: npm i --global purescript@0.15.10 purs-tidy@latest spago@next purescript-psa@latest purescm@next + run: npm i --global purescript@0.15.10 spago@next purescm@next - name: Build source run: npm run build diff --git a/package.json b/package.json index dbd20f8a..c8493e12 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,5 @@ "scripts": { "build": "spago build", "test": "spago build && purescm bundle-app --main Test.Main && scheme --program output/main" - }, - "devDependencies": { - "purescm": "1.0.0" } } From 2930fa1e02cdbf3d17fb3fef80819aa60695266e Mon Sep 17 00:00:00 2001 From: Antti Holvikari Date: Sat, 30 Sep 2023 20:20:53 +0300 Subject: [PATCH 9/9] Use `purescm run` --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c8493e12..83579124 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,6 @@ "private": true, "scripts": { "build": "spago build", - "test": "spago build && purescm bundle-app --main Test.Main && scheme --program output/main" + "test": "spago build && purescm run --main Test.Main" } }