Skip to content

Commit

Permalink
Merge branch 'master' into compatibility-test
Browse files Browse the repository at this point in the history
  • Loading branch information
nnichols authored Sep 30, 2024
2 parents c98927d + 5b10014 commit f05cb97
Show file tree
Hide file tree
Showing 26 changed files with 476 additions and 70 deletions.
17 changes: 17 additions & 0 deletions .bouncer/config.edn
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{:comment "The default configuration for Wall Brew projects."
:project-rules {:license {:comment "https://github.com/Wall-Brew-Co/open-source?tab=readme-ov-file#licensing"
:disabled false}
:plugins {:disabled false
:available-plugins [{:comment "https://github.com/Wall-Brew-Co/rebroadcast?tab=readme-ov-file#sealog-configuration"
:plugin-name "com.wallbrew/lein-sealog"
:plugin-version "1.6.0"}
{:comment "https://github.com/Wall-Brew-Co/rebroadcast?tab=readme-ov-file#clj-kondo-configuration"
:plugin-name "com.github.clj-kondo/lein-clj-kondo"
:plugin-version "2024.08.29"}
{:plugin-name "lein-cljsbuild",
:plugin-version "1.1.8"
:disabled true
:reason "cljsbuild is only required for ClojureScript and cross-platform projects."}
{:comment "https://github.com/Wall-Brew-Co/rebroadcast?tab=readme-ov-file#cljstyle-configuration"
:plugin-name "mvxcvi/cljstyle"
:plugin-version "0.16.630"}]}}}
80 changes: 44 additions & 36 deletions .clj-kondo/config.edn
Original file line number Diff line number Diff line change
@@ -1,36 +1,44 @@
{:output {:pattern "::{{level}} file={{filename}},line={{row}},col={{col}}::{{message}}"}
:linters {:aliased-namespace-symbol {:level :warning}
:consistent-alias {:aliases {clojure.edn edn
clojure.java.io io
clojure.math math
clojure.set set
clojure.walk walk
clojure.zip zip
clojure.core.async async
clojure.data.csv csv
clojure.data.xml xml
clojure.tools.cli cli
clojure.java.shell sh
clojure.pprint pp
clojure.spec.alpha spec
clojure.string str
clojure.core.matrix mat
clojure.tools.logging log
clojure.core.reducers r}}
:docstring-leading-trailing-whitespace {:level :warning}
:keyword-binding {:level :warning}
:main-without-gen-class {:level :warning}
:missing-docstring {:level :warning}
:namespace-name-mismatch {:level :warning}
:reduce-without-init {:level :warning}
:redundant-fn-wrapper {:level :warning}
:refer {:level :warning
:exclude #{clojure.test cljs.test doo.runner}}
:refer-all {:exclude #{clojure.test}}
:shadowed-var {:level :warning}
:single-key-in {:level :warning}
:unresolved-symbol {:exclude [(clojure.test/is [match?])
clojure.test.check.clojure-test/defspec]}
:unsorted-required-namespaces {:level :warning}
:used-underscored-binding {:level :warning}
:unused-value {:level :warning}}}
{:exclude-files ".clj-kondo/imports/.*"
:output {:pattern "::{{level}} file={{filename}},line={{row}},col={{col}}::{{message}}"}
:ns-groups [{:pattern "\\*\\.experimental\\.\\*"
:name experimental-features}
{:pattern "\\*\\.impl"
:name implementation-only}]
:linters {:aliased-namespace-symbol {:level :warning}
:consistent-alias {:aliases {clojure.edn edn
clojure.java.io io
clojure.math math
clojure.set set
clojure.walk walk
clojure.zip zip
clojure.core.async async
clojure.data.csv csv
clojure.data.xml xml
clojure.tools.cli cli
clojure.java.shell sh
clojure.pprint pp
clojure.spec.alpha spec
clojure.string str
clojure.core.matrix mat
clojure.tools.logging log
clojure.core.reducers r}}
:discouraged-var {clojure.core/read-string {:message "Use `clojure.edn/read-string` instead of `read-string`."}}
:discouraged-namespace {experimental-features {:message "These functions are considered experimental and can break or change implementation in future releases."}
implementation-only {:message "These functions are considered internal implementation details and are not part of their respective public api."}}
:docstring-leading-trailing-whitespace {:level :warning}
:keyword-binding {:level :warning}
:main-without-gen-class {:level :warning}
:missing-docstring {:level :warning}
:namespace-name-mismatch {:level :warning}
:reduce-without-init {:level :warning}
:redundant-fn-wrapper {:level :warning}
:refer {:level :warning
:exclude #{clojure.test cljs.test doo.runner}}
:refer-all {:exclude #{clojure.test}}
:shadowed-var {:level :warning}
:single-key-in {:level :warning}
:unresolved-symbol {:exclude [(clojure.test/is [match?])
clojure.test.check.clojure-test/defspec]}
:unsorted-required-namespaces {:level :warning}
:used-underscored-binding {:level :warning}
:unused-value {:level :warning}}}
7 changes: 5 additions & 2 deletions .cljstyle
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{:files {:extensions #{"clj" "cljs" "cljc" "cljx" "edn"}
:ignore #{"target" ".git" ".idea" ".vscode" "node_modules"}}
:rules {:namespaces {:enabled? false}}}
:ignore #{"target" ".git" ".idea" ".vscode" "node_modules" ".clj-kondo" ".calva" ".lsp"}}
:rules {:namespaces {:enabled? false}
:indentation {:indents {#"defspec" [[:inner 0]]
#"defstate" [[:inner 0]]
#"for-all" [[:inner 0]]}}}}
6 changes: 5 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
# Proposed Changes

Quickly describe your change and the rationale behind it.
Please link to any relevant issues or discussions.

- Additions:
- Updates:
- Deletions:

## Pre-merge Checklist

- [ ] Write + run tests
- [ ] Read and agree to the Contribution Guidelines and Code of Conduct
- [ ] Write new tests for the changed functionality
- [ ] Update CHANGELOG and increment version
- [ ] Update README and relevant documentation
2 changes: 1 addition & 1 deletion .github/workflows/cljdoc_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
check-cljdoc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.7
- uses: actions/checkout@v4.2.0

- name: Cache maven dependencies
uses: actions/cache@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clojure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Cache maven dependencies
uses: actions/cache@v4
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ on:

jobs:
contributors:
# This job requires the Wall Brew Bot Token, so it is only run on non-forked repositories
if: github.repository_owner == 'Wall-Brew-Co'
runs-on: ubuntu-latest
steps:
- uses: wow-actions/contributors-list@v1
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/deploy_to_clojars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ on:

jobs:
deploy:
# This job requires the Wall Brew Bot Token, so it is only run on non-forked repositories
if: github.repository_owner == 'Wall-Brew-Co'

runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Cache maven dependencies
uses: actions/cache@v4
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ on: [pull_request]

jobs:
formatting:
# This job requires the Wall Brew Bot Token, so it is only run on non-forked repositories
if: github.repository_owner == 'Wall-Brew-Co'

runs-on: ubuntu-latest

steps:
- name: git checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
ref: ${{ github.head_ref }}
token: ${{ secrets.WALL_BREW_BOT_PAT }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on: [pull_request, issues]

jobs:
greeting:
# This job requires the Wall Brew Bot Token, so it is only run on non-forked repositories
if: github.repository_owner == 'Wall-Brew-Co'
runs-on: ubuntu-latest
steps:
- uses: actions/first-interaction@v1
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on: [pull_request]

jobs:
label:
# This job requires the Wall Brew Bot Token, so it is only run on non-forked repositories
if: github.repository_owner == 'Wall-Brew-Co'

runs-on: ubuntu-latest

Expand Down
49 changes: 45 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
name: Linter
on: [pull_request, workflow_dispatch]

on: ["push", "workflow_dispatch", "pull_request"]

jobs:
spell-check:
# This job requires the Wall Brew Bot Token, so it is only run on non-forked repositories
if: github.repository_owner == 'Wall-Brew-Co'

runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
ref: ${{ github.head_ref }}

Expand All @@ -23,11 +27,14 @@ jobs:
# Brewing applications support both US and non-US English

clj-kondo:
# This job requires the Wall Brew Bot Token, so it is only run on non-forked repositories
if: github.repository_owner == 'Wall-Brew-Co'

runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
ref: ${{ github.head_ref }}

Expand All @@ -44,12 +51,46 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
ref: ${{ github.head_ref }}

- name: Cache maven dependencies
uses: actions/cache@v4
env:
cache-name: cache-maven
with:
path: ~/.m2
save-always: true
key: ${{ runner.os }}-clj-lint-sealog-${{ hashFiles('**/project.clj') }}
restore-keys: |
${{ runner.os }}-clj
- name: Validate Sealog Entries
run: lein sealog check

bouncer:
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/[email protected]
with:
ref: ${{ github.head_ref }}

- name: Cache maven dependencies
uses: actions/cache@v4
env:
cache-name: cache-maven
with:
path: ~/.m2
save-always: true
key: ${{ runner.os }}-clj-lint-bouncer-${{ hashFiles('**/project.clj') }}
restore-keys: |
${{ runner.os }}-clj
- name: Validate Sealog Entries
run: lein bouncer check

# This file was automatically copied and populated by rebroadcast
# Do not edit this file directly, instead modify the source at https://github.com/Wall-Brew-Co/rebroadcast/blob/master/sources/github-actions/workflows/lint.yml
2 changes: 1 addition & 1 deletion .github/workflows/scanner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
security-events: write
steps:
- name: Checkout code
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Scan code
uses: clj-holmes/clj-holmes-action@53daa4da4ff495cccf791e4ba4222a8317ddae9e
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync_labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Checkout latest commit
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Synchronize labels
uses: micnncim/action-label-syncer@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Generate TODO Tickets
uses: ribtoks/tdg-github-action@master
Expand Down
11 changes: 11 additions & 0 deletions .sealog/changes/1-10-0.edn
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{:version {:major 1
:minor 10
:patch 0}
:version-type :semver3
:changes {:added []
:changed []
:deprecated []
:removed []
:fixed ["Updated the organization name in the POM file to `Wall Brew Co.`"]
:security []}
:timestamp "2024-09-20T16:41:55.023940098Z"}
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## Table of Contents

* [1.10.0 - 2024-09-20](#1100---2024-09-20)
* [1.9.1 - 2024-07-12](#191---2024-07-12)
* [1.9.0 - 2024-03-12](#190---2024-03-12)
* [1.8.1 - 2024-03-10](#181---2024-03-10)
Expand All @@ -23,6 +24,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
* [1.1.0 - 2020-12-14](#110---2020-12-14)
* [1.0.0 - 2020-12-12](#100---2020-12-12)

## 1.10.0 - 2024-09-20

* Fixed
* Updated the organization name in the POM file to `Wall Brew Co.`

## 1.9.1 - 2024-07-12

* Fixed
Expand Down
4 changes: 4 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# Barring any major exception, all Wall Brew Developers should be maintainers of any file
* @Wall-Brew-Co/wall-brew-developers

## This file was automatically copied and populated by rebroadcast

## Do not edit this file directly, instead modify the source at <https://github.com/Wall-Brew-Co/rebroadcast/blob/master/sources/community/CODEOWNERS>
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Representation of a project may be further defined and clarified by project main

## Enforcement

Any and all instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@wallbrew.com.
Any and all instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact [at] wallbrew [dot] com.
All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
The project team is obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.
Expand Down
Loading

0 comments on commit f05cb97

Please sign in to comment.