From 18fa365d9e808b0dfcdd7eb6748f663413afbd5c Mon Sep 17 00:00:00 2001 From: jem Date: Fri, 10 Jul 2020 08:17:46 +0200 Subject: [PATCH 1/6] releasing --- .github/workflows/build.yml | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53e8d12..2d913fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -94,12 +94,12 @@ jobs: env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} run: | - mkdir -p target/npm-build/dda-masto-embed - cp public/js/main.js target/npm-build/dda-masto-embed/dda-masto-embed.js - cp target/dda-masto-embed.js.sha256 target/npm-build/dda-masto-embed/ - cp target/dda-masto-embed.js.sha512 target/npm-build/dda-masto-embed/ - cp package.json target/npm-build/dda-masto-embed/ - cp README.md target/npm-build/dda-masto-embed/ - cp -r doc target/npm-build/dda-masto-embed/ - cp LICENSE target/npm-build/dda-masto-embed/ + mkdir -p target/npm-build/ + cp public/js/main.js target/npm-build/dda-masto-embed.js + cp target/dda-masto-embed.js.sha256 target/npm-build/ + cp target/dda-masto-embed.js.sha512 target/npm-build/ + cp package.json target/npm-build/ + cp README.md target/npm-build/ + cp -r doc target/npm-build/ + cp LICENSE target/npm-build/ npm publish target/npm-build --access public diff --git a/package.json b/package.json index 2963be6..4a47204 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "dda-masto-embed", "author": "meissa GmbH", - "version": "0.1.5", + "version": "0.1.6", "homepage": "https://github.com/DomainDrivenArchitecture/dda-masto-embed", "repository": "https://github.com/DomainDrivenArchitecture/dda-masto-embed", "license": "Apache-2.0", From 0b1e9773daa700a13b62a7d36661e82c95e1fc6e Mon Sep 17 00:00:00 2001 From: jem Date: Fri, 10 Jul 2020 10:20:13 +0200 Subject: [PATCH 2/6] reduce artefact size --- .github/workflows/build.yml | 18 +++++++++++++++--- .gitignore | 3 ++- package.json | 10 +++++----- shadow-cljs.edn | 2 +- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d913fb..d43bd4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,6 +45,7 @@ jobs: shadow-cljs release frontend sha256sum public/js/main.js > target/dda-masto-embed.js.sha256 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 id: create_release @@ -66,7 +67,7 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: public/js/main.js asset_name: dda-masto-embed.js - asset_content_type: application/json + asset_content_type: application/javascript - name: Upload masto-embed.js.sha256 id: upload-masto-embed-js-sha256 @@ -77,7 +78,7 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: target/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 id: upload-masto-embed-js-sha512 @@ -88,7 +89,18 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: target/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: report.html + 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 env: diff --git a/.gitignore b/.gitignore index fc6713d..c6f18bc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ pom.xml.asc .shadow-cljs/ node_modules/ /public/js -/out \ No newline at end of file +/out +package-lock.json diff --git a/package.json b/package.json index 4a47204..1cd5401 100644 --- a/package.json +++ b/package.json @@ -1,19 +1,19 @@ { "name": "dda-masto-embed", "author": "meissa GmbH", - "version": "0.1.6", + "version": "0.1.7", "homepage": "https://github.com/DomainDrivenArchitecture/dda-masto-embed", "repository": "https://github.com/DomainDrivenArchitecture/dda-masto-embed", "license": "Apache-2.0", "private": false, "devDependencies": { "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": { - "ajv": "^6.12.2", - "eslint": ">=4.18.2", - "lodash.template": ">=4.5.0", "mastodon-api": "^1.3.0" }, "main": "mastodon-bot.js", diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 75bea7d..f443c48 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -19,6 +19,6 @@ :release {:compiler-options {:optimizations :simple}}} :frontend {:target :browser :modules {:main {:init-fn dda.masto-embed.app/init}} - :release {:compiler-options {:optimizations :simple}}}}} + :release {}}}} From 6a84df7c7e639f725fb622baebfedfce80d7b6d8 Mon Sep 17 00:00:00 2001 From: jem Date: Fri, 10 Jul 2020 10:23:04 +0200 Subject: [PATCH 3/6] releasing --- .github/workflows/build.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d43bd4f..e572ec8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,7 +92,7 @@ jobs: asset_content_type: text/plain - name: Upload build report - id: report.html + id: build-report uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index 1cd5401..2fb3653 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "dda-masto-embed", "author": "meissa GmbH", - "version": "0.1.7", + "version": "0.1.9", "homepage": "https://github.com/DomainDrivenArchitecture/dda-masto-embed", "repository": "https://github.com/DomainDrivenArchitecture/dda-masto-embed", "license": "Apache-2.0", From 30e6e1a8e9e674604c797b6567e06191fdf164bd Mon Sep 17 00:00:00 2001 From: jem Date: Fri, 10 Jul 2020 10:47:09 +0200 Subject: [PATCH 4/6] fix main --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2fb3653..66f8015 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "dependencies": { "mastodon-api": "^1.3.0" }, - "main": "mastodon-bot.js", + "main": "dda-masto-embed.js", "keywords": [ "cljs", "mastodon", From 437033ef25f563061ed4908f35cb3db79e4d55b0 Mon Sep 17 00:00:00 2001 From: jem Date: Mon, 13 Jul 2020 18:23:07 +0200 Subject: [PATCH 5/6] add unstable build --- .github/workflows/{build.yml => stable.yml} | 6 +-- .github/workflows/unstable.yml | 41 +++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) rename .github/workflows/{build.yml => stable.yml} (98%) create mode 100644 .github/workflows/unstable.yml diff --git a/.github/workflows/build.yml b/.github/workflows/stable.yml similarity index 98% rename from .github/workflows/build.yml rename to .github/workflows/stable.yml index e572ec8..63563c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/stable.yml @@ -1,12 +1,12 @@ -name: build-it +name: stable on: push: tags: - '[0-9]+.[0-9]+.[0-9]+' jobs: - build-it: - name: build-it + stable: + name: stable runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/unstable.yml b/.github/workflows/unstable.yml new file mode 100644 index 0000000..404de48 --- /dev/null +++ b/.github/workflows/unstable.yml @@ -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 From 770006b06f55128b17f1e14b9fd4ec4759006df0 Mon Sep 17 00:00:00 2001 From: Jan Krebs Date: Tue, 29 Jun 2021 09:54:03 +0200 Subject: [PATCH 6/6] Add copyright notice to Readme --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 115802c..406ae12 100644 --- a/README.md +++ b/README.md @@ -76,3 +76,9 @@ git push --follow-tags vi package.json 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) \ No newline at end of file