Skip to content

Commit d98a6fb

Browse files
committed
Update scripts to move /setup -> /
1 parent 0b3fc3f commit d98a6fb

File tree

4 files changed

+14
-20
lines changed

4 files changed

+14
-20
lines changed

.github/workflows/workflow.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ on:
1010
- "**.md"
1111
workflow_dispatch:
1212

13-
defaults:
14-
run:
15-
working-directory: setup
16-
1713
jobs:
1814
test:
1915
name: Unit Tests - ${{ matrix.os }}
@@ -27,7 +23,7 @@ jobs:
2723
with:
2824
node-version: "16"
2925
cache: "npm"
30-
cache-dependency-path: setup/package-lock.json
26+
cache-dependency-path: package-lock.json
3127
- run: npm ci --prefer-offline --no-audit --progress=false
3228
- run: npm run bundle
3329
- run: npm test
@@ -132,7 +128,7 @@ jobs:
132128
steps:
133129
- uses: actions/checkout@v3
134130

135-
- uses: ./setup
131+
- uses: ./
136132
with:
137133
ghc-version: ${{ matrix.plan.ghc }}
138134
ghcup-release-channel: ${{ matrix.ghcup_release_channel }}
@@ -150,15 +146,15 @@ jobs:
150146
runghc __tests__/hello.hs
151147
152148
- name: Build test project
153-
working-directory: setup/__tests__/project
149+
working-directory: __tests__/project
154150
run: cabal build
155151

156152
- name: Run test project
157-
working-directory: setup/__tests__/project
153+
working-directory: __tests__/project
158154
run: cabal run
159155

160156
- name: Install test project
161-
working-directory: setup/__tests__/project
157+
working-directory: __tests__/project
162158
run: cabal install
163159

164160
- name: Run installed test project
@@ -167,7 +163,7 @@ jobs:
167163

168164
- name: Build and run test with Hackage dependency
169165
if: ${{ matrix.cabal_update != 'false' }}
170-
working-directory: setup/__tests__/project-with-hackage-dependency
166+
working-directory: __tests__/project-with-hackage-dependency
171167
run: cabal build && cabal run
172168

173169
- name: Confirm installed and expected versions match
@@ -192,7 +188,7 @@ jobs:
192188
os: [ubuntu-latest, macOS-latest, windows-latest]
193189
steps:
194190
- uses: actions/checkout@v3
195-
- uses: ./setup
191+
- uses: ./
196192
id: setup
197193
env:
198194
RUNNER_DEBUG: "1"
@@ -216,7 +212,7 @@ jobs:
216212
steps:
217213
- uses: actions/checkout@v3
218214

219-
- uses: ./setup
215+
- uses: ./
220216
id: setup
221217
with:
222218
enable-stack: true

.husky/pre-commit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
33

4-
cd setup || exit
54
npx --no-install lint-staged

.husky/pre-push

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
33

4-
cd setup || exit
54
npm test

.lintstagedrc.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module.exports = {
2-
"**/!(*test).{ts,json}": [
3-
"eslint --cache --fix",
4-
() => "npm run bundle",
5-
() => "git add setup/dist/ setup/lib/",
2+
'**/!(*test).{ts,json}': [
3+
'eslint --cache --fix',
4+
() => 'npm run bundle',
5+
() => 'git add dist/ lib/'
66
],
7-
"**/*.ts": () => "tsc -p tsconfig.json",
8-
"**/*.{js,ts,json,md}": "prettier --write",
7+
'**/*.ts': () => 'tsc -p tsconfig.json',
8+
'**/*.{js,ts,json,md}': 'prettier --write'
99
};

0 commit comments

Comments
 (0)