Merge pull request #96 from atc0005/sync-from-master

Sync latest changes from master branch
atc0005 · Aug 22, 2023 · 5bb35d0 · 5bb35d0
2 parents 0bab9df + e02e904
commit 5bb35d0
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 10 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -111,8 +111,8 @@ updates:
     ignore:
       - dependency-name: "golang"
         versions:
-          - ">= 1.20"
-          - "< 1.19"
+          - ">= 1.21"
+          - "< 1.20"
 
   - package-ecosystem: docker
     directory: "/dependabot/docker/go"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,26 @@ The following types of changes will be recorded in this file:
 
 - placeholder
 
+## [v0.2.3] - 2023-08-09
+
+### Added
+
+- (GH-62) Add initial automated release notes config
+- (GH-64) Add initial automated release build workflow
+
+### Changed
+
+- Dependencies
+  - `Go`
+    - `1.19.11` to `1.19.12`
+  - `atc0005/go-ci`
+    - `go-ci-oldstable-build-v0.11.4` to `go-ci-oldstable-build-v0.13.2`
+- (GH-66) Update Dependabot config to monitor both branches
+
+### Fixed
+
+- (GH-80) Makefile: Fix version output
+
 ## [v0.2.2] - 2023-07-14
 
 ### Overview
@@ -158,7 +178,8 @@ This release provides an early release version of one new tool:
 
 See the project README for additional details.
 
-[Unreleased]: https://github.com/atc0005/safelinks/compare/v0.2.2...HEAD
+[Unreleased]: https://github.com/atc0005/safelinks/compare/v0.2.3...HEAD
+[v0.2.3]: https://github.com/atc0005/safelinks/releases/tag/v0.2.3
 [v0.2.2]: https://github.com/atc0005/safelinks/releases/tag/v0.2.2
 [v0.2.1]: https://github.com/atc0005/safelinks/releases/tag/v0.2.1
 [v0.2.0]: https://github.com/atc0005/safelinks/releases/tag/v0.2.0

diff --git a/README.md b/README.md
@@ -167,12 +167,15 @@ binaries.
 
 ##### Flags
 
-| Flag           | Required | Default | Repeat | Possible       | Description                                                                                       |
-| -------------- | -------- | ------- | ------ | -------------- | ------------------------------------------------------------------------------------------------- |
-| `h`, `help`    | No       | `false` | No     | `h`, `help`    | Show Help text along with the list of supported flags.                                            |
-| `version`      | No       | `false` | No     | `version`      | Whether to display application version and then immediately exit application.                     |
-| `v`, `verbose` | No       | `false` | No     | `v`, `verbose` | Toggles listing of all processes. WARNING: This may produce a LOT of output. Disabled by default. |
-| `u`, `url`     |
+| Flag           | Required | Default | Repeat | Possible       | Description                                                                   |
+| -------------- | -------- | ------- | ------ | -------------- | ----------------------------------------------------------------------------- |
+| `h`, `help`    | No       | `false` | No     | `h`, `help`    | Show Help text along with the list of supported flags.                        |
+| `version`      | No       | `false` | No     | `version`      | Whether to display application version and then immediately exit application. |
+| `v`, `verbose` | No       | `false` | No     | `v`, `verbose` | Display additional information about a given Safe Links URL.                  |
+| `u`, `url`     | *maybe*  |         | No     | `u`, `url`     | Safe Links URL to decode                                                      |
+
+NOTE: If the `url` flag is not specified a prompt is provided to enter a Safe
+Links URL.
 
 ##### Positional Argument
 

diff --git a/go.mod b/go.mod
@@ -1,3 +1,3 @@
 module github.com/atc0005/safelinks
 
-go 1.19
+go 1.20