diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 39293b5..2a95109 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -10,8 +10,6 @@ jobs: env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - ORG_GITHUB_ACTOR: ${{ secrets.ORG_GITHUB_ACTOR }} - ORG_GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_TOKEN }} steps: - name: Checkout git repo @@ -39,11 +37,8 @@ jobs: with: servers: | [{"id": "github-kepler", - "username": "${{secrets.ORG_GITHUB_ACTOR}}", - "password": "${{secrets.ORG_GITHUB_TOKEN}}"}, - {"id": "github-kepler-releases", - "username": "${{secrets.ORG_GITHUB_ACTOR}}", - "password": "${{secrets.ORG_GITHUB_TOKEN}}"}] + "username": "GITHUB", + "password": "${{secrets.GITHUB_TOKEN}}"}] - uses: extractions/setup-just@v1 diff --git a/Justfile b/Justfile index 6b46a00..b7d94c3 100644 --- a/Justfile +++ b/Justfile @@ -18,12 +18,12 @@ clean: rm -rf target build: clean - clojure -T:meta run :alias lib :lib {{library}} :version \"{{version}}\" + clojure -T:build org.corfield.build/jar :lib {{library}} :version \"{{version}}\" :transitive true mkdir -p {{assets_dir}} cp target/*.jar {{assets_dir}} release: - clojure -T:meta deploy :repository \"{{maven_server}}\" :lib {{library}} :version \"{{version}}\" + clojure -T:build org.corfield.build/deploy :repository \"{{maven_server}}\" :lib {{library}} :version \"{{version}}\" repl *ARGS: bin/launchpad --emacs dev {{ ARGS }} diff --git a/deps.edn b/deps.edn index bccb419..6b67e26 100644 --- a/deps.edn +++ b/deps.edn @@ -1,6 +1,6 @@ {:paths ["src"] - :mvn/repos {"github-kepler-releases" {:url "https://maven.pkg.github.com/kepler16/*"} - "github-kepler" {:url "https://maven.pkg.github.com/kepler16/gx.cljc"}} + :mvn/repos {"github-kepler" + {:url "https://maven.pkg.github.com/kepler16/gx.cljc"}} :deps {funcool/promesa {:mvn/version "10.0.594"} @@ -20,11 +20,6 @@ org.clojure/tools.logging {:mvn/version "1.2.4"}} :jvm-opts ["-Dclojure.tools.logging.factory=clojure.tools.logging.impl/slf4j-factory"]} - :lib {:k16/metabuild {:kind :jar}} - - :meta {:deps {kepler16/metabuild {:mvn/version "0.3.9"}} - :ns-default k16.metabuild.api} - :test {:extra-paths ["test"] :extra-deps {io.github.cognitect-labs/test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"}} @@ -35,4 +30,7 @@ :extra-deps {lambdaisland/kaocha {:mvn/version "1.70.1086"}} :main-opts ["-m" "kaocha.runner"]} + :build {:deps {io.github.seancorfield/build-clj + {:git/tag "v0.8.0" :git/sha "9bd8b8a"}}} + :shadow-cljs {:main-opts ["-m" "shadow.cljs.devtools.cli"]}}}