Skip to content

Commit 119df26

Browse files
committed
Version 0.93.19
1 parent f15eb5a commit 119df26

File tree

8 files changed

+39
-44
lines changed

8 files changed

+39
-44
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ jobs:
7272
- name: Build the project
7373
run: spago build
7474

75-
# - name: Bootstrap executable
76-
# run: node ./bin/index.dev.js bundle -p spago-bin
75+
- name: Bootstrap executable
76+
run: node ./bin/index.dev.js bundle -p spago-bin
7777

78-
# - name: Bundle docs-search client
79-
# run: node ./bin/bundle.js bundle -p docs-search-client-halogen
78+
- name: Bundle docs-search client
79+
run: node ./bin/bundle.js bundle -p docs-search-client-halogen
8080

81-
# - name: Run tests
82-
# run: node ./bin/bundle.js test
81+
- name: Run tests
82+
run: node ./bin/bundle.js test
8383

8484
- name: Check formatting (Linux only)
8585
if: matrix.os == 'ubuntu-latest'

bin/spago.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: spago-bin
33
publish:
4-
version: 0.93.18
4+
version: 0.93.19
55
license: BSD-3-Clause
66
dependencies:
77
- aff

bin/src/Main.purs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -496,11 +496,6 @@ parseArgs = do
496496
main :: Effect Unit
497497
main = do
498498
startingTime <- Now.now
499-
let
500-
printVersion = do
501-
logOptions <- mkLogOptions startingTime { noColor: false, quiet: false, verbose: false, offline: Offline }
502-
runSpago { logOptions } do
503-
logInfo BuildInfo.buildInfo.spagoVersion
504499
parseArgs >>=
505500
\c -> Aff.launchAff_ case c of
506501
Cmd'SpagoCmd (SpagoCmd globalArgs@{ offline } command) -> do
@@ -661,13 +656,14 @@ main = do
661656
purs <- Purs.getPurs
662657
runSpago { dependencies, logOptions, purs, workspace: env.workspace } (Graph.graphPackages args)
663658

664-
Cmd'VersionCmd v -> do when v printVersion
659+
Cmd'VersionCmd v -> when v do
660+
output (OutputLines [ BuildInfo.packages."spago-bin" ])
665661
where
666662
mkLogOptions :: Instant -> GlobalArgs -> Aff LogOptions
667663
mkLogOptions startingTime { noColor, quiet, verbose } = do
668664
supports <- liftEffect supportsColor
669-
let color = and [ supports, not noColor ]
670665
let
666+
color = and [ supports, not noColor ]
671667
verbosity =
672668
if quiet then
673669
LogQuiet

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "spago",
3-
"version": "0.93.18",
3+
"version": "0.93.19",
44
"license": "BSD-3-Clause",
55
"description": "🍝 PureScript package manager and build tool",
66
"keywords": [

spago.lock

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -206,23 +206,25 @@ workspace:
206206
registry: 20.0.1
207207
extra_packages:
208208
html-parser-halogen:
209+
git: https://github.com/rnons/purescript-html-parser-halogen.git
210+
ref: 035a51d02ba9f8b70c3ffd9fe31a3f5bed19941c
209211
dependencies:
210212
- halogen
211213
- string-parsers
212-
git: https://github.com/rnons/purescript-html-parser-halogen.git
213-
ref: 035a51d02ba9f8b70c3ffd9fe31a3f5bed19941c
214214
jest:
215+
git: https://github.com/nonbili/purescript-jest.git
216+
ref: caf2032f2e5828337e897a99f5359c00e91cb0ee
215217
dependencies:
216218
- aff
217219
- aff-promise
218220
- effect
219221
- foldable-traversable
220222
- prelude
221223
- psci-support
222-
git: https://github.com/nonbili/purescript-jest.git
223-
ref: caf2032f2e5828337e897a99f5359c00e91cb0ee
224224
json-codecs: 4.0.0
225225
language-cst-parser:
226+
git: https://github.com/natefaubion/purescript-language-cst-parser.git
227+
ref: v0.13.0
226228
dependencies:
227229
- arrays
228230
- console
@@ -253,9 +255,9 @@ workspace:
253255
- typelevel-prelude
254256
- unfoldable
255257
- unsafe-coerce
256-
git: https://github.com/natefaubion/purescript-language-cst-parser.git
257-
ref: v0.13.0
258258
language-purescript:
259+
git: https://github.com/JordanMartinez/purescript-language-purescript.git
260+
ref: db4377dea03ba9c5273a93a8368a53f1d87882c1
259261
dependencies:
260262
- argonaut-core
261263
- arrays
@@ -283,22 +285,22 @@ workspace:
283285
- tuples
284286
- unicode
285287
- versions
286-
git: https://github.com/JordanMartinez/purescript-language-purescript.git
287-
ref: db4377dea03ba9c5273a93a8368a53f1d87882c1
288288
markdown-it:
289+
git: https://github.com/nonbili/purescript-markdown-it.git
290+
ref: f6e8ee91298f2fc13c4277e75a19e0538de5f7a2
289291
dependencies:
290292
- effect
291293
- options
292294
- prelude
293-
git: https://github.com/nonbili/purescript-markdown-it.git
294-
ref: f6e8ee91298f2fc13c4277e75a19e0538de5f7a2
295295
markdown-it-halogen:
296+
git: https://github.com/nonbili/purescript-markdown-it-halogen.git
297+
ref: 08c9625015bf04214be14e45230e8ce12f3fa2bf
296298
dependencies:
297299
- html-parser-halogen
298300
- markdown-it
299-
git: https://github.com/nonbili/purescript-markdown-it-halogen.git
300-
ref: 08c9625015bf04214be14e45230e8ce12f3fa2bf
301301
memoize:
302+
git: https://github.com/paf31/purescript-memoize.git
303+
ref: 9960694e82adc212fd89f8ed8778cf55fcb72aeb
302304
dependencies:
303305
- either
304306
- integers
@@ -308,9 +310,9 @@ workspace:
308310
- prelude
309311
- strings
310312
- tuples
311-
git: https://github.com/paf31/purescript-memoize.git
312-
ref: 9960694e82adc212fd89f8ed8778cf55fcb72aeb
313313
node-glob-basic:
314+
git: https://github.com/natefaubion/purescript-node-glob-basic.git
315+
ref: v1.2.2
314316
dependencies:
315317
- aff
316318
- console
@@ -329,8 +331,6 @@ workspace:
329331
- refs
330332
- strings
331333
- tuples
332-
git: https://github.com/natefaubion/purescript-node-glob-basic.git
333-
ref: v1.2.2
334334
ordered-collections: 3.1.1
335335
registry-foreign:
336336
git: https://github.com/purescript/registry-dev.git
@@ -341,16 +341,18 @@ workspace:
341341
ref: 6a803c37577af368caa221a2a06d6be2079d32da
342342
subdir: lib
343343
search-trie:
344+
git: https://github.com/klntsky/purescript-search-trie.git
345+
ref: e7f7f22486a1dba22171ec885dbc2149dc815119
344346
dependencies:
345347
- arrays
346348
- bifunctors
347349
- foldable-traversable
348350
- lists
349351
- ordered-collections
350352
- prelude
351-
git: https://github.com/klntsky/purescript-search-trie.git
352-
ref: e7f7f22486a1dba22171ec885dbc2149dc815119
353353
tidy:
354+
git: https://github.com/natefaubion/purescript-tidy.git
355+
ref: v0.10.0
354356
dependencies:
355357
- arrays
356358
- control
@@ -366,9 +368,9 @@ workspace:
366368
- prelude
367369
- strings
368370
- tuples
369-
git: https://github.com/natefaubion/purescript-tidy.git
370-
ref: v0.10.0
371371
tidy-codegen:
372+
git: https://github.com/natefaubion/purescript-tidy-codegen.git
373+
ref: v4.0.0
372374
dependencies:
373375
- aff
374376
- ansi
@@ -412,8 +414,6 @@ workspace:
412414
- tuples
413415
- type-equality
414416
- unicode
415-
git: https://github.com/natefaubion/purescript-tidy-codegen.git
416-
ref: v4.0.0
417417
packages:
418418
aff:
419419
type: registry

spago.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: spago
33
publish:
4-
version: 0.93.18
4+
version: 0.93.19
55
license: BSD-3-Clause
66
location:
77
githubOwner: purescript

src/Spago/BuildInfo.purs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ type BuildInfo =
2323
, version :: String
2424
}
2525
-- , buildTime :: String -- TODO add build time to build info
26+
-- , commitHash :: String -- TODO add commit hash to build info
2627
, pursVersion :: String
2728
}
2829

@@ -60,7 +61,7 @@ mkBuildInfo { packages, pursVersion } = String.joinWith "\n"
6061
, "module Spago.Generated.BuildInfo where"
6162
, ""
6263
, "packages :: " <> recordType
63-
, "packages = "
64+
, "packages ="
6465
, " { " <> String.joinWith "\n , " (map renderPackage packages) <> "\n }"
6566
, ""
6667
, "pursVersion :: String"
@@ -74,13 +75,11 @@ mkBuildInfo { packages, pursVersion } = String.joinWith "\n"
7475
recordType = "{ " <> String.joinWith ", " (map renderPackageType packages) <> " }"
7576
renderPackage p = "\"" <> p.name <> "\": \"" <> p.version <> "\""
7677
renderPackageType p = "\"" <> p.name <> "\" :: String"
78+
currentSpagoVersion = BuildInfo.packages."spago-bin"
7779

7880
buildInfoPath FilePath
7981
buildInfoPath = Path.concat [ Paths.localCachePath, "BuildInfo.purs" ]
8082

81-
currentSpagoVersion :: String
82-
currentSpagoVersion = BuildInfo.buildInfo.packages."spago-bin"
83-
8483
mkPackageBuildInfo :: WorkspacePackage -> { name :: String, version :: String }
8584
mkPackageBuildInfo { package } =
8685
{ name: PackageName.print package.name

0 commit comments

Comments
 (0)