Merge branch 'DomainDrivenArchitecture:master' into master

This commit is contained in:
Mattis Böckle 2022-03-04 11:06:28 +01:00 committed by GitHub
commit 6b8ca6d2ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 82 additions and 22 deletions

View file

@ -1,12 +1,12 @@
name: build-it name: stable
on: on:
push: push:
tags: tags:
- '[0-9]+.[0-9]+.[0-9]+' - '[0-9]+.[0-9]+.[0-9]+'
jobs: jobs:
build-it: stable:
name: build-it name: stable
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
@ -45,6 +45,7 @@ jobs:
shadow-cljs release frontend shadow-cljs release frontend
sha256sum public/js/main.js > target/dda-masto-embed.js.sha256 sha256sum public/js/main.js > target/dda-masto-embed.js.sha256
sha512sum public/js/main.js > target/dda-masto-embed.js.sha512 sha512sum public/js/main.js > target/dda-masto-embed.js.sha512
shadow-cljs run shadow.cljs.build-report frontend target/build-report.html
- name: Create Release - name: Create Release
id: create_release id: create_release
@ -66,7 +67,7 @@ jobs:
upload_url: ${{ steps.create_release.outputs.upload_url }} upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: public/js/main.js asset_path: public/js/main.js
asset_name: dda-masto-embed.js asset_name: dda-masto-embed.js
asset_content_type: application/json asset_content_type: application/javascript
- name: Upload masto-embed.js.sha256 - name: Upload masto-embed.js.sha256
id: upload-masto-embed-js-sha256 id: upload-masto-embed-js-sha256
@ -77,7 +78,7 @@ jobs:
upload_url: ${{ steps.create_release.outputs.upload_url }} upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: target/dda-masto-embed.js.sha256 asset_path: target/dda-masto-embed.js.sha256
asset_name: dda-masto-embed.js.sha256 asset_name: dda-masto-embed.js.sha256
asset_content_type: application/json asset_content_type: text/plain
- name: Upload masto-embed.js.sha512 - name: Upload masto-embed.js.sha512
id: upload-masto-embed-js-sha512 id: upload-masto-embed-js-sha512
@ -88,18 +89,29 @@ jobs:
upload_url: ${{ steps.create_release.outputs.upload_url }} upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: target/dda-masto-embed.js.sha512 asset_path: target/dda-masto-embed.js.sha512
asset_name: dda-masto-embed.js.sha512 asset_name: dda-masto-embed.js.sha512
asset_content_type: application/json asset_content_type: text/plain
- name: Upload build report
id: build-report
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: target/build-report.html
asset_name: build-report.html
asset_content_type: text/html
- name: upload to npm - name: upload to npm
env: env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
run: | run: |
mkdir -p target/npm-build/dda-masto-embed mkdir -p target/npm-build/
cp public/js/main.js target/npm-build/dda-masto-embed/dda-masto-embed.js cp public/js/main.js target/npm-build/dda-masto-embed.js
cp target/dda-masto-embed.js.sha256 target/npm-build/dda-masto-embed/ cp target/dda-masto-embed.js.sha256 target/npm-build/
cp target/dda-masto-embed.js.sha512 target/npm-build/dda-masto-embed/ cp target/dda-masto-embed.js.sha512 target/npm-build/
cp package.json target/npm-build/dda-masto-embed/ cp package.json target/npm-build/
cp README.md target/npm-build/dda-masto-embed/ cp README.md target/npm-build/
cp -r doc target/npm-build/dda-masto-embed/ cp -r doc target/npm-build/
cp LICENSE target/npm-build/dda-masto-embed/ cp LICENSE target/npm-build/
npm publish target/npm-build --access public npm publish target/npm-build --access public

41
.github/workflows/unstable.yml vendored Normal file
View file

@ -0,0 +1,41 @@
name: unstable
on:
push:
tags:
- '![0-9]+.[0-9]+.[0-9]+'
jobs:
unstable:
name: unstable
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
steps:
- uses: actions/checkout@v2
- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
- name: test em
run: |
npm install
npm install -g --save-dev shadow-cljs
shadow-cljs compile test

1
.gitignore vendored
View file

@ -18,3 +18,4 @@ output.calva-repl
node_modules/ node_modules/
/public/js /public/js
/out /out
package-lock.json

View file

@ -76,3 +76,9 @@ git push --follow-tags
vi package.json vi package.json
git commit -am "version bump" && git push git commit -am "version bump" && git push
``` ```
## License
Copyright © 2021 meissa GmbH
Licensed under the [Apache License, Version 2.0](LICENSE) (the "License")
Pls. find licenses of our subcomponents [here](doc/SUBCOMPONENT_LICENSE)

View file

@ -1,22 +1,22 @@
{ {
"name": "dda-masto-embed", "name": "dda-masto-embed",
"author": "meissa GmbH", "author": "meissa GmbH",
"version": "0.1.5", "version": "0.1.9",
"homepage": "https://github.com/DomainDrivenArchitecture/dda-masto-embed", "homepage": "https://github.com/DomainDrivenArchitecture/dda-masto-embed",
"repository": "https://github.com/DomainDrivenArchitecture/dda-masto-embed", "repository": "https://github.com/DomainDrivenArchitecture/dda-masto-embed",
"license": "Apache-2.0", "license": "Apache-2.0",
"private": false, "private": false,
"devDependencies": { "devDependencies": {
"shadow-cljs": "^2.8.104", "shadow-cljs": "^2.8.104",
"source-map-support": "^0.5.19" "source-map-support": "^0.5.19",
"eslint": ">=4.18.2",
"ajv": "^6.12.2",
"lodash.template": ">=4.5.0"
}, },
"dependencies": { "dependencies": {
"ajv": "^6.12.2",
"eslint": ">=4.18.2",
"lodash.template": ">=4.5.0",
"mastodon-api": "^1.3.0" "mastodon-api": "^1.3.0"
}, },
"main": "mastodon-bot.js", "main": "dda-masto-embed.js",
"keywords": [ "keywords": [
"cljs", "cljs",
"mastodon", "mastodon",

View file

@ -19,6 +19,6 @@
:release {:compiler-options {:optimizations :simple}}} :release {:compiler-options {:optimizations :simple}}}
:frontend {:target :browser :frontend {:target :browser
:modules {:main {:init-fn dda.masto-embed.app/init}} :modules {:main {:init-fn dda.masto-embed.app/init}}
:release {:compiler-options {:optimizations :simple}}}}} :release {}}}}