Update dependencies (#219)

* docs: Update CHANGELOG

* chore: Same Makefile setup as in js-lib

* chore: Update js-lib version

* fix(make): Bug fix in Makefile

* chore(CI): Update CHANGELOG on release only and attach to assets

* chore: Delete CHANGELOG

* chore(CI): Update CHANGELOG on release only and add to build

* chore: Update Makefile's vars

* docs: Update READEM

.github/workflows/main.yml

@@ -109,6 +109,21 @@ jobs:
         uses: "WyriHaximus/github-action-get-previous-tag@1.0.0"
       - name: Update version
         run: cd ${{env.dist-directory}} && npm version ${{steps.previoustag.outputs.tag}} --git-tag-version=false --commit-hooks=false
+      - name: Update CHANGELOG
+        uses: lakto/gren-changelog-action@v0.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+        with:
+          options: '--override'
+      - name: Attach CHANGELOG to release assets
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GH_TOKEN }}
+          file: CHANGELOG.md
+          tag: ${{ github.ref }}
+          overwrite: true
+      - name: Add CHANGELOG to build
+        run: cp CHANGELOG.md ${{env.dist-directory}}
       - if: "github.event.release.prerelease"
         name: Publish pre-release to npm
         run: npm publish ${{env.dist-directory}} --tag rc --access public

.gitignore

@@ -41,6 +41,7 @@ npm-debug.log
 yarn-error.log
 testem.log
 /typings
+CHANGELOG.md
 
 # System Files
 .DS_Store

Makefile

@@ -4,13 +4,15 @@ BIN = ./node_modules/.bin
 THIS_FILE := $(abspath $(lastword $(MAKEFILE_LIST)))
 CURRENT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 
+include vars.mk
+
 .PHONY: clean
 
 # Clones the knora-api git repository
 .PHONY: clone-knora-stack
 clone-knora-stack:
 	@rm -rf $(CURRENT_DIR)/.tmp/knora-stack
-	@git clone --branch v13.0.0-rc.21 --single-branch --depth 1 https://github.com/dasch-swiss/knora-api.git $(CURRENT_DIR)/.tmp/knora-stack
+	@git clone --branch $(API_VERSION) --single-branch --depth 1 https://github.com/dasch-swiss/knora-api.git $(CURRENT_DIR)/.tmp/knora-stack
 
 .PHONY: knora-stack
 knora-stack: clone-knora-stack ## runs the knora-stack

README.md

@@ -256,10 +256,10 @@ You can now access the app on your local machine under <http://localhost:4200/>.
 
 Before publishing:
 
-- Update README and CHANGELOG if necessary and commit the changes (currently, the CHANGELOG has to be updated manually with [gren](https://github.com/github-tools/github-release-notes): `gren changelog --override`)
+- Update README if necessary and commit the changes
 
 - Be sure that all dependencies to DSP-JS-LIB and DSP-API are set to the correct version:
-  - Update DSP-API version in `Makefile`
+  - Update DSP-API version in `vars.mk`
   - Update DSP-JS version in `package.json` and run `npm install` to update the `package-lock.json`
   - Update DSP-JS version in section `peerDependencies` of `projects/dsp-ui/package.json`
 

package.json

@@ -46,7 +46,7 @@
     "@angular/platform-browser-dynamic": "~9.1.2",
     "@angular/router": "~9.1.2",
     "@ckeditor/ckeditor5-angular": "^1.2.3",
-    "@dasch-swiss/dsp-js": "^1.0.0-rc.14",
+    "@dasch-swiss/dsp-js": "^1.0.0-rc.15",
     "ckeditor5-custom-build": "github:dasch-swiss/ckeditor_custom_build",
     "jdnconvertiblecalendar": "^0.0.5",
     "jdnconvertiblecalendardateadapter": "^0.0.13",

projects/dsp-ui/package.json

@@ -21,7 +21,7 @@
     "@angular/core": "^9.0.0",
     "@angular/material": "^9.0.0",
     "@angular/cdk": "^9.0.0",
-    "@dasch-swiss/dsp-js": "1.0.0-rc.14",
+    "@dasch-swiss/dsp-js": "1.0.0-rc.15",
     "jdnconvertiblecalendar": "^0.0.5",
     "jdnconvertiblecalendardateadapter": "^0.0.13",
     "ngx-color-picker": "^10.0.1",

vars.mk

@@ -0,0 +1 @@
+API_VERSION := v13.0.0-rc.21