Merge branch 'tmp_pipeline_experiment' into 'master'

improve prerelease ci

See merge request yogthos/mastodon-bot!8
master
Michael Jerger 3 years ago
commit 5d0f6fbb97

@ -31,6 +31,8 @@ stages:
.clj-job: &clj .clj-job: &clj
image: clojure:lein-2.7.1-alpine image: clojure:lein-2.7.1-alpine
before_script:
- echo "{:auth {:repository-auth {#\"clojars\" {:username \"${CLOJARS_USER}\" :password \"${CLOJARS_PASSWORD}\" }}}}" > ~/.lein/profiles.clj
build_and_test: build_and_test:
<<: *cljs <<: *cljs
@ -42,7 +44,7 @@ build_and_test:
paths: paths:
- .m2 - .m2
#activate as soon as https://github.com/thheller/shadow-cljs/issues/843 is implemented #activate as soon as https://github.com/thheller/shadow-cljs/issues/843 is implemented
.report: .report:
<<: *cljs <<: *cljs
stage: build_and_test stage: build_and_test
@ -84,10 +86,8 @@ upload-cljs-prerelease:
- if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG == null' - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG == null'
script: script:
- cp package.json target/npm-build/ - cp package.json target/npm-build/
- sed -i 's|SNAPSHOT|'$(date +"%Y%m%d%H%M%S")'|' ./target/npm-build/package.json
- npm publish ./target/npm-build --access public - npm publish ./target/npm-build --access public
# unsure wether that's a good idea to bump versions from ci.
#- npm version prerelease -m "[skip-ci] version bump prerelease version"
#- git push
upload-clj-prerelease: upload-clj-prerelease:
<<: *clj <<: *clj
@ -95,8 +95,7 @@ upload-clj-prerelease:
rules: rules:
- if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG == null' - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG == null'
script: script:
- echo "{:user {:auth {#\"clojars\" {:username :env/CLOJARS_USER :password :env/CLOJARS_PASSWORD}}}}" > ~/.lein/profiles.clj - lein deploy clojars
- lein deploy
upload-js-release: upload-js-release:
<<: *js-upload <<: *js-upload

@ -2,7 +2,7 @@
"name": "mastodon-bot", "name": "mastodon-bot",
"description": "Bot to publish twitter, tumblr or rss posts to an mastodon account.", "description": "Bot to publish twitter, tumblr or rss posts to an mastodon account.",
"author": "Dmitri Sotnikov", "author": "Dmitri Sotnikov",
"version": "1.10.5-20210311180500", "version": "1.10.5-SNAPSHOT",
"homepage": "https://github.com/yogthos/mastodon-bot", "homepage": "https://github.com/yogthos/mastodon-bot",
"repository": "https://www.npmjs.com/package/mastodon-bot", "repository": "https://www.npmjs.com/package/mastodon-bot",
"license": "MIT", "license": "MIT",