Skip to content

Commit c555ccb

Browse files
authored
Bump package dependencies and libarchive (#428)
* Bump package dependencies and libarchive * Update the reference documentation to adjust to a change in the tool info representation * Update the tool info JSON files to add the required parsing strategy
1 parent a1bd2f8 commit c555ccb

File tree

21 files changed

+2881
-57
lines changed

21 files changed

+2881
-57
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
- name: Prepare the action
182182
run: ./scripts/prep-gh-action.sh --install-swiftly
183183
- name: Generate Swiftly CLI Reference and Check for Differences
184-
run: swift package plugin --allow-writing-to-package-directory generate-docs-reference && bash -c 'git config --global --add safe.directory $(pwd)' && git diff --exit-code Documentation/SwiftlyDocs.docc/swiftly-cli-reference.md || (echo "The documentation hasn't been updated with the latest swiftly command-line reference. Please run `swift package plugin generate-docs-reference` and commit/push the changes."; exit 1)
184+
run: swift package plugin --allow-writing-to-package-directory generate-docs-reference && bash -c 'git config --global --add safe.directory $(pwd)' && git diff --exit-code Documentation/SwiftlyDocs.docc/swiftly-cli-reference.md || (echo "The documentation hasn't been updated with the latest swiftly command-line reference. Please run 'swift package plugin generate-docs-reference' and commit/push the changes."; exit 1)
185185
- name: Generate Documentation Set
186186
run: swift package --allow-writing-to-directory .build/docs generate-documentation --target SwiftlyDocs --output-path .build/docs
187187
- name: Upload Documentation Artifacts

Documentation/SwiftlyDocs.docc/swiftly-cli-reference.md

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ swiftly [--version] [--help]
2323
Install a new toolchain.
2424

2525
```
26-
swiftly install [<version>] [--use] [--verify|no-verify] [--post-install-file=<post-install-file>] [--progress-file=<progress-file>] [--format=<format>] [--assume-yes] [--verbose] [--version] [--help]
26+
swiftly install [<version>] [--use] [--verify] [--no-verify] [--post-install-file=<post-install-file>] [--progress-file=<progress-file>] [--format=<format>] [--assume-yes] [--verbose] [--version] [--help]
2727
```
2828

2929
**version:**
@@ -67,9 +67,14 @@ NOTE: Swiftly downloads toolchains to a temporary file that it later cleans duri
6767
*Mark the newly installed toolchain as in-use.*
6868

6969

70-
**--verify|no-verify:**
70+
**--verify:**
7171

72-
*Verify the toolchain's PGP signature before proceeding with installation.*
72+
*Verify (or not) the toolchain's PGP signature before proceeding with installation.*
73+
74+
75+
**--no-verify:**
76+
77+
*Verify (or not) the toolchain's PGP signature before proceeding with installation.*
7378

7479

7580
**--post-install-file=\<post-install-file\>:**
@@ -365,7 +370,7 @@ The installed snapshots for a given development branch can be listed by specifyi
365370
Update an installed toolchain to a newer version.
366371

367372
```
368-
swiftly update [<toolchain>] [--assume-yes] [--verbose] [--verify|no-verify] [--post-install-file=<post-install-file>] [--version] [--help]
373+
swiftly update [<toolchain>] [--assume-yes] [--verbose] [--verify] [--no-verify] [--post-install-file=<post-install-file>] [--version] [--help]
369374
```
370375

371376
**toolchain:**
@@ -416,9 +421,14 @@ A specific snapshot toolchain can be updated by including the date:
416421
*Enable verbose reporting from swiftly*
417422

418423

419-
**--verify|no-verify:**
424+
**--verify:**
425+
426+
*Verify (or not) the toolchain's PGP signature before proceeding with installation.*
427+
420428

421-
*Verify the toolchain's PGP signature before proceeding with installation.*
429+
**--no-verify:**
430+
431+
*Verify (or not) the toolchain's PGP signature before proceeding with installation.*
422432

423433

424434
**--post-install-file=\<post-install-file\>:**
@@ -690,3 +700,21 @@ Unlinks swiftly until swiftly is linked again with:
690700

691701

692702

703+
## help
704+
705+
Show subcommand help information.
706+
707+
```
708+
swiftly help [<subcommands>...] [--version]
709+
```
710+
711+
**subcommands:**
712+
713+
714+
**--version:**
715+
716+
*Show the version.*
717+
718+
719+
720+

Package.resolved

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

Sources/Swiftly/Install.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct Install: SwiftlyCommand {
5656

5757
@Flag(
5858
inversion: .prefixedNo,
59-
help: "Verify the toolchain's PGP signature before proceeding with installation."
59+
help: "Verify (or not) the toolchain's PGP signature before proceeding with installation."
6060
)
6161
var verify = true
6262

Sources/Swiftly/Update.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ struct Update: SwiftlyCommand {
6262

6363
@OptionGroup var root: GlobalOptions
6464

65-
@Flag(inversion: .prefixedNo, help: "Verify the toolchain's PGP signature before proceeding with installation.")
65+
@Flag(inversion: .prefixedNo, help: "Verify (or not) the toolchain's PGP signature before proceeding with installation.")
6666
var verify = true
6767

6868
@Option(help: ArgumentHelp(

Sources/SwiftlyCore/dscl.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"kind": "long",
1717
"name": "datasource"
1818
},
19+
"parsingStrategy": "default",
1920
"valueName": "datasource",
2021
"isOptional": true,
2122
"isRepeating": false,
@@ -32,13 +33,15 @@
3233
"shouldDisplay": true,
3334
"arguments": [
3435
{
36+
"parsingStrategy": "default",
3537
"valueName": "path",
3638
"shouldDisplay": true,
3739
"kind": "positional",
3840
"isOptional": true,
3941
"isRepeating": false
4042
},
4143
{
44+
"parsingStrategy": "default",
4245
"valueName": "key",
4346
"shouldDisplay": true,
4447
"kind": "positional",

Sources/SwiftlyCore/getent.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
"shouldDisplay": true,
77
"arguments": [
88
{
9+
"parsingStrategy": "default",
910
"valueName": "database",
1011
"isOptional": false,
1112
"isRepeating": false,
1213
"kind": "positional",
1314
"shouldDisplay": true
1415
},
1516
{
17+
"parsingStrategy": "default",
1618
"valueName": "key",
1719
"isOptional": false,
1820
"isRepeating": true,

0 commit comments

Comments
 (0)