Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 9 additions & 33 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,39 +1,15 @@
---
name: Publish package to GitHub Packages and clojars.org

permissions:
contents: read

on:
push:
tags:
- '*'
workflow_dispatch:

jobs:
publish:
runs-on: ubuntu-24.04
permissions:
contents: write
packages: write
steps:
- uses: actions/checkout@v6
- uses: actions/setup-java@v5
with:
java-version: '21'
distribution: temurin
- name: Install clojure tools
uses: DeLaGuardo/setup-clojure@13.4
with:
lein: 'latest'
#- name: Publish package to GitHub
# run: lein deploy github
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# GITHUB_ACTOR: ${{ github.actor }}
- name: Publish to clojars.org
run: lein deploy clojars
env:
CLOJARS_USERNAME: ${{ secrets.CLOJARS_USERNAME }}
CLOJARS_PASSWORD: ${{ secrets.CLOJARS_PASSWORD }}
- name: Create Release Page
shell: bash
env:
GH_TOKEN: ${{ github.token }}
run: gh release create --repo ${{ github.repository }} ${{ github.ref_name }} --generate-notes
release:
uses: 'openvoxproject/shared-actions/.github/workflows/clojure_release.yml@main'
secrets:
github_pat: ${{ secrets.OPENVOXBOT_COMMIT_AND_PRS }}
ssh_private_key: ${{ secrets.OPENVOXBOT_SSH_PRIVATE_KEY }}
2 changes: 0 additions & 2 deletions CODEOWNERS

This file was deleted.

6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ To create a release of clj-parent, first determine the release version.
The release should reflect the updated projects. For example, if a component is updated to a new feature (Y) release, clj-parent should get a new feature (Y) release.

If releasing a new X or Y version, open a PR to update the
[SNAPSHOT release version](https://github.com/puppetlabs/clj-parent/blob/main/project.clj#L10)
[SNAPSHOT release version](https://github.com/OpenVoxProject/clj-parent/blob/main/project.clj#L10)
to the next `x.y.0-SNAPSHOT` version.

Once merged, run [the release pipeline](https://cinext-jenkinsmaster-enterprise-prod-1.delivery.puppetlabs.net/job/enterprise_clj-parent_release-clj_main/)
with default parameters, which will handle the relevant updates to the
project.clj version for the release.
Once merged, run the release action, which will handle the relevant updates to the project.clj version for the release.
57 changes: 28 additions & 29 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
(def clj-version "1.11.2")
(def ks-version "3.4.0")
(def tk-version "4.1.0")
(def tk-jetty-10-version "1.0.18")
(def tk-metrics-version "2.0.4")
(def ks-version "3.4.2")
(def tk-version "4.1.1")
(def tk-jetty-10-version "1.0.19")
(def tk-metrics-version "2.0.5")
(def logback-version "1.3.14")
(def rbac-client-version "1.1.5")
(def rbac-client-version "1.1.8")
(def dropwizard-metrics-version "3.2.2")

(defproject org.openvoxproject/clj-parent "7.4.1-SNAPSHOT"
Expand Down Expand Up @@ -105,32 +105,31 @@
[prismatic/schema "1.1.12"]
[stylefruits/gniazdo "1.2.1"]

[puppetlabs/http-client "2.1.4"]
[puppetlabs/jdbc-util "1.4.3"]
[puppetlabs/typesafe-config "0.2.0"]
[puppetlabs/ssl-utils "3.5.2"]
[puppetlabs/kitchensink ~ks-version]
[puppetlabs/kitchensink ~ks-version :classifier "test"]
[org.openvoxproject/http-client "2.1.5"]
[org.openvoxproject/typesafe-config "0.2.1"]
[org.openvoxproject/ssl-utils "3.5.4"]
[org.openvoxproject/kitchensink ~ks-version]
[org.openvoxproject/kitchensink ~ks-version :classifier "test"]
[org.openvoxproject/trapperkeeper ~tk-version]
[org.openvoxproject/trapperkeeper ~tk-version :classifier "test"]
[com.puppetlabs/trapperkeeper-webserver-jetty10 ~tk-jetty-10-version]
[com.puppetlabs/trapperkeeper-webserver-jetty10 ~tk-jetty-10-version :classifier "test"]
[puppetlabs/trapperkeeper-metrics ~tk-metrics-version]
[puppetlabs/trapperkeeper-metrics ~tk-metrics-version :classifier "test"]
[puppetlabs/trapperkeeper-scheduler "1.1.3"]
[puppetlabs/trapperkeeper-authorization "2.0.1"]
[puppetlabs/trapperkeeper-status "1.2.0"]
[puppetlabs/trapperkeeper-filesystem-watcher "1.2.6"]
[puppetlabs/structured-logging "0.2.0"]
[puppetlabs/ring-middleware "2.0.4"]
[puppetlabs/dujour-version-check "1.0.0"]
[puppetlabs/comidi "1.0.0"]
[puppetlabs/trapperkeeper-comidi-metrics "0.1.1"]
[puppetlabs/i18n "0.9.2"]
[puppetlabs/rbac-client ~rbac-client-version]
[puppetlabs/rbac-client ~rbac-client-version :classifier "test"]
[puppetlabs/clj-shell-utils "2.0.1"]
[puppetlabs/jruby-utils "5.2.0"]
[org.openvoxproject/trapperkeeper-webserver-jetty10 ~tk-jetty-10-version]
[org.openvoxproject/trapperkeeper-webserver-jetty10 ~tk-jetty-10-version :classifier "test"]
[org.openvoxproject/trapperkeeper-metrics ~tk-metrics-version]
[org.openvoxproject/trapperkeeper-metrics ~tk-metrics-version :classifier "test"]
[org.openvoxproject/trapperkeeper-scheduler "1.2.4"]
[org.openvoxproject/trapperkeeper-authorization "2.0.2"]
[org.openvoxproject/trapperkeeper-status "1.2.1"]
[org.openvoxproject/trapperkeeper-filesystem-watcher "1.2.7"]
[org.openvoxproject/structured-logging "0.2.1"]
[org.openvoxproject/ring-middleware "2.0.5"]
[org.openvoxproject/dujour-version-check "1.0.1"]
[org.openvoxproject/comidi "1.0.1"]
[org.openvoxproject/trapperkeeper-comidi-metrics "0.1.3"]
[org.openvoxproject/i18n "0.9.3"]
[org.openvoxproject/rbac-client ~rbac-client-version]
[org.openvoxproject/rbac-client ~rbac-client-version :classifier "test"]
[org.openvoxproject/clj-shell-utils "2.0.2"]
[org.openvoxproject/jruby-utils "5.2.1"]

;; When these versions change we need to also
;; promote the changes into the PE packaging repo
Expand Down