Skip to content

Commit

Permalink
Merge branch 'master' into dgr-issue-604-addendum
Browse files Browse the repository at this point in the history
* master:
  Move to w3c WebDriver spec (clj-commons#616)
  minor breaking: Remove support for PhantomJS (clj-commons#614)
  ci: publish: Move to release tag triggered publishing (clj-commons#611)
  docs: review & update changelog (clj-commons#610)
  Minimal safari driver logging (clj-commons#601)
  Ignore emacs backup files (clj-commons#609)
  • Loading branch information
lread committed Aug 13, 2024
2 parents 124a644 + e58ff88 commit 19c0636
Show file tree
Hide file tree
Showing 32 changed files with 2,099 additions and 1,751 deletions.
1 change: 1 addition & 0 deletions .clj-kondo/config.edn
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{:config-paths ^:replace ;; don't adopt any user preferences
["hooks" ;; keep our internal hooks separate from imported ones
"../resources/clj-kondo.exports/etaoin/etaoin"] ;; include our exported public config
:output {:linter-name true}
:cljc {:features [:clj]} ;; our bb reader conditionals might make some tools also assume cljs, state otherwise
:hooks
;; for internal stuff, I'm fine with using macroexpand, our external config uses analyze-call for
Expand Down
2 changes: 0 additions & 2 deletions .cljfmt.edn
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
when-not-edge [[:inner 0]]
when-not-firefox [[:inner 0]]
when-not-headless [[:inner 0]]
when-not-phantom [[:inner 0]]
when-not-predicate [[:inner 0]]
when-not-safari [[:inner 0]]
when-phantom [[:inner 0]]
when-predicate [[:inner 0]]
when-safari [[:inner 0]]
try+ [[:block 0]]}}
55 changes: 55 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Publish

on:
push:
tags:
- 'v\d+.*'

jobs:
test:
uses: ./.github/workflows/test.yml

publish:
environment: publish
runs-on: ubuntu-latest
needs: [test]

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Restore Clojure deps from cache
uses: actions/cache/restore@v4
with:
path: |
~/.m2/repository
~/.deps.clj
~/.gitlibs
enableCrossOsArchive: true
key: cljdeps-${{ hashFiles('deps.edn', 'bb.edn') }}
restore-keys: cljdeps-

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'

- name: Install Clojure Tools
uses: DeLaGuardo/[email protected]
with:
bb: 'latest'

- name: Deploy to clojars
env:
CLOJARS_USERNAME: ${{ secrets.CLOJARS_USERNAME }}
CLOJARS_PASSWORD: ${{ secrets.CLOJARS_PASSWORD }}
run: bb -ci-clojars-deploy

- name: Create GitHub Release
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: bb -ci-github-create-release

- name: Inform Cljdoc
run: bb -ci-cljdoc-request-build
78 changes: 0 additions & 78 deletions .github/workflows/release.yml

This file was deleted.

9 changes: 8 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Test

on:
workflow_call: # for Publish
push:
branches:
- master
Expand All @@ -13,6 +14,7 @@ jobs:
runs-on: ubuntu-latest

outputs:
skip_tests: ${{ steps.check_for_skip.outputs.skip_tests }}
tests: ${{ steps.set-tests.outputs.tests }}

steps:
Expand Down Expand Up @@ -44,14 +46,20 @@ jobs:
- name: Bring down deps
run: bb download-deps

- name: Check if Tests Should Run
id: check_for_skip
run: bb -ci-set-skip-tests

- id: set-tests
if: steps.check_for_skip.outputs.skip_tests == 'false'
name: Set test var for matrix
# run test.clj directly instead of via bb task to avoid generic task output
run: echo "tests=$(bb script/test_matrix.clj --format json)" >> $GITHUB_OUTPUT

build:
needs: setup
runs-on: ${{ matrix.os }}-latest
if: needs.setup.outputs.skip_tests == 'false'
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -129,7 +137,6 @@ jobs:
mv ../../../.gitlibs ${USERPROFILE}
shell: bash


- name: Setup Java
uses: actions/setup-java@v4
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ pom.xml.asc
.hgignore
.hg/
.DS_Store
*~

gh-pages
node_modules
Expand All @@ -34,3 +35,4 @@ build.xml
/fiddle/
/.cljdoc-preview
/.vscode

Loading

0 comments on commit 19c0636

Please sign in to comment.