Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
rads authored Oct 19, 2024
2 parents 830fccc + 0dcfdad commit b5a3f51
Show file tree
Hide file tree
Showing 35 changed files with 1,565 additions and 672 deletions.
46 changes: 42 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,70 @@ on: [push, pull_request]
jobs:
bb-run-test-linux:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
bb-version: [1.3.190, latest]
steps:
- name: Check out repository code
uses: actions/checkout@v3
- name: Install clojure tools
uses: DeLaGuardo/[email protected]
with:
bb: latest
bb: ${{ matrix.bb-version }}
- run: bb run test

bb-run-test-macos:
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
bb-version: [1.3.190, latest]
steps:
- name: Check out repository code
uses: actions/checkout@v3
- name: Install clojure tools
uses: DeLaGuardo/[email protected]
with:
bb: ${{ matrix.bb-version }}
- run: bb run test

bb-run-test-windows:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
bb-version: [latest]
steps:
- name: Check out repository code
uses: actions/checkout@v3
- name: Install clojure tools
uses: DeLaGuardo/[email protected]
with:
bb: latest
- run: bb run test
bb: ${{ matrix.bb-version }}
- name: bb test
shell: bash
run: |
curl -sLO https://github.com/babashka/babashka-dev-builds/releases/download/v1.3.191-SNAPSHOT/babashka-1.3.191-SNAPSHOT-windows-amd64.zip
unzip babashka-1.3.191-SNAPSHOT-windows-amd64.zip
# overwrite installed bb with custom
cp bb.exe "$(which bb)"
- name: bb test
run: |
bb run test
bb-run-lint:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
bb-version: [1.3.190, latest]
steps:
- name: Check out repository code
uses: actions/checkout@v3
- name: Install clojure tools
uses: DeLaGuardo/[email protected]
with:
bb: latest
bb: ${{ matrix.bb-version }}
clj-kondo: latest
- run: bb run lint
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# Changelog

[bbin](https://github.com/babashka/bbin): Install any Babashka script or project with one command

<!-- Notes for publishing: -->

<!-- - Update this changelog -->
<!-- - Change version in `deps.edn :aliases :neil :project :version` -->
<!-- - Run `bb gen-script` -->
<!-- - Create tag -->
<!-- - Go to https://github.com/babashka/homebrew-brew and run `bb update-bbin` and publish the new Formula -->

## 0.2.4

- [Fix #88: NPE when using `bbin ls` in dirs with zero-length files](https://github.com/babashka/bbin/issues/88)

## 0.2.3

- [Fix error in compiled script when installing from Homebrew (again)](https://github.com/babashka/bbin/commit/f0a3096a1e57408af77eed35f86a3d71cccccb07)

## 0.2.2

- [Fix #62: bbin ls is unnecessarily slow](https://github.com/babashka/bbin/issues/62)
- [Fix #72: bbin install [LOCAL-FILE] should not be restricted to files with the .clj extension](https://github.com/babashka/bbin/issues/72)

## 0.2.1

- [Fix error in compiled script when installing from Homebrew](https://github.com/babashka/bbin/commit/ba1749a3308744c9dcecc1f032214aeb109bb073)
Expand Down
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,17 @@ If no `--git/tag` or `--git/sha` is provided, the latest tag from the Git repo w

---

## Dev

-To install a development version of bbin, first install bbin stable, then install bbin with bbin.

```
$ bbin install . --as bbin-dev --main-opts '["-m" babashka.bbin.cli/-main]'
```

You can now run your development copy of bbin with `bbin-dev`.
Rebuilding is not required for `bbin-dev` installed this way, changes in Clojure source code is reflected instantly.

## Contributing

If you'd like to contribute to `bbin`, you're welcome to create [issues for ideas, feature requests, and bug reports](https://github.com/babashka/bbin/issues).
Expand Down
8 changes: 6 additions & 2 deletions bb.edn
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@
(run 'test))}
lint (shell "clj-kondo --lint .")
test {:depends [gen-script]
:requires ([babashka.bbin.test-runner])
:task (exec 'babashka.bbin.test-runner/run-tests)}
:extra-deps {io.github.cognitect-labs/test-runner
{:git/tag "v0.5.1" :git/sha "dfb30dd"}
ring/ring-core {:mvn/version "1.12.1"}}
:task cognitect.test-runner/-main}
gen-script {:doc "Build the bbin script"
:extra-deps {org.clojure/tools.namespace
{:mvn/version "1.5.0"}}
:requires ([babashka.bbin.gen-script :as gen-script])
:task (gen-script/gen-script)}
render-templates {:requires ([clojure.string :as str]
Expand Down
Loading

0 comments on commit b5a3f51

Please sign in to comment.