Skip to content

Commit

Permalink
Merge pull request #114 from mattpolzin/version-help-command
Browse files Browse the repository at this point in the history
bump Harmony version to 3.3.0
  • Loading branch information
mattpolzin authored Jan 15, 2024
2 parents 633a00b + 4e355be commit 5184c26
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 17 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,15 @@ build: ./node_modules/ depends/idris-adds-${idris-adds-version} depends/json-${i

harmony: build

node2nix ?= nix run nixpkgs\#node2nix
nix ?= nix
node2nix ?= $(nix) run nixpkgs\#node2nix

# This executes a Nix build. Call as `make nix-build` from CLI, not
# from a Nix file.
nix-build:
${MAKE} clean
$(node2nix) -- --composition node2nix.nix # -l # <- can't use -l for lockfile because lockfile version 3 not supported yet.
nix build .
$(nix) build .

version:
@(if [[ "${v}" == '' ]]; then echo "please set the 'v' variable."; exit 1; fi)
Expand All @@ -119,6 +120,7 @@ version:
sed -I '' "s/version = \".*\";/version = \"${v}\";/" ./default.nix
@npm update
@$(node2nix) -- --composition node2nix.nix # -l # <- can't use -l for lockfile because lockfile version 3 not supported yet.
@$(nix) fmt

package: build
./version-check.sh
Expand Down
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
};

harmonyPkg = buildIdris {
version = "3.2.0";
version = "3.3.0";
projectName = "harmony";
src = ./.;

Expand Down
2 changes: 1 addition & 1 deletion harmony.ipkg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package harmony
version = 3.2.0
version = 3.3.0
authors = "Mathew Polzin"
license = "MIT"
brief = "Harmony GitHub collaboration tool"
Expand Down
12 changes: 6 additions & 6 deletions node-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,13 @@
sha512 = "VRLSGzik+Unrup6BsouBeHsf4d1hOEgYWTm/7Nmw1sXoN1+tRly/Gy/po3yeahnP4jfnQWWAhQAqcNfH7ngOkA==";
};
};
"@types/node-20.10.8" = {
"@types/node-20.11.3" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "20.10.8";
version = "20.11.3";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-20.10.8.tgz";
sha512 = "f8nQs3cLxbAFc00vEU59yf9UyGUftkPaLGfvbVOIDdx2i1b8epBqj2aNGyP19fiyXWvlmZ7qC1XLjAzw/OKIeA==";
url = "https://registry.npmjs.org/@types/node/-/node-20.11.3.tgz";
sha512 = "nrlmbvGPNGaj84IJZXMPhQuCMEVTT/hXZMJJG/aIqVL9fKxqk814sGGtJA4GI6hpJSLQjpi6cn0Qx9eOf9SDVg==";
};
};
"aggregate-error-3.1.0" = {
Expand Down Expand Up @@ -598,7 +598,7 @@
args = {
name = "_at_mattpolzin_slash_harmony";
packageName = "@mattpolzin/harmony";
version = "3.2.0";
version = "3.3.0";
src = ./.;
dependencies = [
sources."@kwsites/file-exists-1.1.1"
Expand Down Expand Up @@ -631,7 +631,7 @@
sources."@types/aws-lambda-8.10.131"
sources."@types/btoa-lite-1.0.2"
sources."@types/jsonwebtoken-9.0.5"
sources."@types/node-20.10.8"
sources."@types/node-20.11.3"
sources."aggregate-error-3.1.0"
sources."before-after-hook-2.2.3"
sources."bottleneck-2.19.5"
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mattpolzin/harmony",
"version": "3.2.0",
"version": "3.3.0",
"engines" : {
"node" : ">=18.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/AppVersion.idr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module AppVersion

export
appVersion : String
appVersion = "3.2.0"
appVersion = "3.3.0"

export
printVersion : HasIO io => io ()
Expand Down

0 comments on commit 5184c26

Please sign in to comment.