Merge pull request #26 from pmonks/dev

Release 1.0.151
pmonks · Mar 27, 2024 · e74a2a6 · e74a2a6
2 parents bfa2ae5 + bb1f704
commit e74a2a6
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,14 +18,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
-      - uses: DeLaGuardo/setup-clojure@12.1
+          java-version: 21
+      - uses: DeLaGuardo/setup-clojure@12.5
         with:
           cli: latest
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -2,7 +2,7 @@ name: deploy
 on:
   push:
     branches:
-      - main
+      - release
 
 jobs:
   deploy:
@@ -13,14 +13,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0    # Make sure we get the full history, or else the version number gets screwed up
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
-      - uses: DeLaGuardo/setup-clojure@12.1
+          java-version: 21
+      - uses: DeLaGuardo/setup-clojure@12.5
         with:
           cli: latest
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -2,22 +2,22 @@ name: docs
 on:
   push:
     branches:
-      - main
+      - release
 
 jobs:
   docs:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
-      - uses: DeLaGuardo/setup-clojure@12.1
+          java-version: 21
+      - uses: DeLaGuardo/setup-clojure@12.5
         with:
           cli: latest
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository

diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
-| | | | |
-|---:|:---:|:---:|:---:|
-| [**main**](https://github.com/pmonks/tools-convenience/tree/main) | [![CI](https://github.com/pmonks/tools-convenience/workflows/CI/badge.svg?branch=main)](https://github.com/pmonks/tools-convenience/actions?query=workflow%3ACI+branch%3Amain) | [![Dependencies](https://github.com/pmonks/tools-convenience/workflows/dependencies/badge.svg?branch=main)](https://github.com/pmonks/tools-convenience/actions?query=workflow%3Adependencies+branch%3Amain) |
-| [**dev**](https://github.com/pmonks/tools-convenience/tree/dev) | [![CI](https://github.com/pmonks/tools-convenience/workflows/CI/badge.svg?branch=dev)](https://github.com/pmonks/tools-convenience/actions?query=workflow%3ACI+branch%3Adev) | [![Dependencies](https://github.com/pmonks/tools-convenience/workflows/dependencies/badge.svg?branch=dev)](https://github.com/pmonks/tools-convenience/actions?query=workflow%3Adependencies+branch%3Adev) |
+| | | |
+|---:|:---:|:---:|
+| [**release**](https://github.com/pmonks/tools-convenience/tree/release) | [![CI](https://github.com/pmonks/tools-convenience/actions/workflows/ci.yml/badge.svg?branch=release)](https://github.com/pmonks/tools-convenience/actions?query=workflow%3ACI+branch%3Arelease) | [![Dependencies](https://github.com/pmonks/tools-convenience/actions/workflows/dependencies.yml/badge.svg?branch=release)](https://github.com/pmonks/tools-convenience/actions?query=workflow%3Adependencies+branch%3Arelease) |
+| [**dev**](https://github.com/pmonks/tools-convenience/tree/dev) | [![CI](https://github.com/pmonks/tools-convenience/actions/workflows/ci.yml/badge.svg?branch=dev)](https://github.com/pmonks/tools-convenience/actions?query=workflow%3ACI+branch%3Adev) | [![Dependencies](https://github.com/pmonks/tools-convenience/actions/workflows/dependencies.yml/badge.svg?branch=dev)](https://github.com/pmonks/tools-convenience/actions?query=workflow%3Adependencies+branch%3Adev) |
 
-[![Latest Version](https://img.shields.io/clojars/v/com.github.pmonks/tools-convenience)](https://clojars.org/com.github.pmonks/tools-convenience/) [![Open Issues](https://img.shields.io/github/issues/pmonks/tools-convenience.svg)](https://github.com/pmonks/tools-convenience/issues) [![License](https://img.shields.io/github/license/pmonks/tools-convenience.svg)](https://github.com/pmonks/tools-convenience/blob/main/LICENSE)
+[![Latest Version](https://img.shields.io/clojars/v/com.github.pmonks/tools-convenience)](https://clojars.org/com.github.pmonks/tools-convenience/) [![License](https://img.shields.io/github/license/pmonks/tools-convenience.svg)](https://github.com/pmonks/tools-convenience/blob/release/LICENSE) [![Open Issues](https://img.shields.io/github/issues/pmonks/tools-convenience.svg)](https://github.com/pmonks/tools-convenience/issues)
 
 # tools-convenience
 
@@ -37,17 +37,17 @@ Include a maven dependency on the library in your `deps.edn`, for a build tool a
 
 ## Contributor Information
 
-[Contributing Guidelines](https://github.com/pmonks/tools-convenience/blob/main/.github/CONTRIBUTING.md)
+[Contributing Guidelines](https://github.com/pmonks/tools-convenience/blob/release/.github/CONTRIBUTING.md)
 
 [Bug Tracker](https://github.com/pmonks/tools-convenience/issues)
 
-[Code of Conduct](https://github.com/pmonks/tools-convenience/blob/main/.github/CODE_OF_CONDUCT.md)
+[Code of Conduct](https://github.com/pmonks/tools-convenience/blob/release/.github/CODE_OF_CONDUCT.md)
 
 ### Developer Workflow
 
-This project uses the [git-flow branching strategy](https://nvie.com/posts/a-successful-git-branching-model/), with the caveat that the permanent branches are called `main` and `dev`, and any changes to the `main` branch are considered a release and auto-deployed (JARs to Clojars, API docs to GitHub Pages, etc.).
+This project uses the [git-flow branching strategy](https://nvie.com/posts/a-successful-git-branching-model/), and the permanent branches are called `release` and `dev`.  Any changes to the `release` branch are considered a release and auto-deployed (JARs to Clojars, API docs to GitHub Pages, etc.).
 
-For this reason, **all development must occur either in branch `dev`, or (preferably) in temporary branches off of `dev`.**  All PRs from forked repos must also be submitted against `dev`; the `main` branch is **only** updated from `dev` via PRs created by the core development team.  All other changes submitted to `main` will be rejected.
+For this reason, **all development must occur either in branch `dev`, or (preferably) in temporary branches off of `dev`.**  All PRs from forked repos must also be submitted against `dev`; the `release` branch is **only** updated from `dev` via PRs created by the core development team.  All other changes submitted to `release` will be rejected.
 
 ### Build Tasks
 

diff --git a/deps.edn b/deps.edn
@@ -17,7 +17,7 @@
 ;
 
 {:deps
-   {io.github.clojure/tools.build {:mvn/version "0.9.6"}}
+   {io.github.clojure/tools.build {:mvn/version "0.10.0"}}
  :aliases
    {:build {:deps       {com.github.pmonks/pbr               {:mvn/version "RELEASE"}
                          com.github.pmonks/tools-convenience {:local/root "."}}

diff --git a/pbr.clj b/pbr.clj
@@ -16,21 +16,18 @@
 ; SPDX-License-Identifier: Apache-2.0
 ;
 
-(def lib 'com.github.pmonks/tools-convenience)
-
 #_{:clj-kondo/ignore [:unresolved-namespace]}
-(def version (format "1.0.%s" (b/git-count-revs nil)))
-
 (defn set-opts
   [opts]
   (assoc opts
-         :lib          lib
-         :version      version
+         :lib          'com.github.pmonks/tools-convenience
+         :version      (pbr/calculate-version 1 0)
+         :prod-branch  "release"
          :write-pom    true
          :validate-pom true
          :pom          {:description      "Convenience fns for tools.build scripts"
                         :url              "https://github.com/pmonks/tools-convenience"
-                        :licenses         [:license   {:name "Apache License 2.0" :url "http://www.apache.org/licenses/LICENSE-2.0.html"}]
+                        :licenses         [:license   {:name "Apache-2.0" :url "http://www.apache.org/licenses/LICENSE-2.0.html"}]
                         :developers       [:developer {:id "pmonks" :name "Peter Monks" :email "pmonks+tools-convenience@gmail.com"}]
                         :scm              {:url "https://github.com/pmonks/tools-convenience" :connection "scm:git:git://github.com/pmonks/tools-convenience.git" :developer-connection "scm:git:ssh://git@github.com/pmonks/tools-convenience.git"}
                         :issue-management {:system "github" :url "https://github.com/pmonks/tools-convenience/issues"}}))