From b2f88e203a82d692f9eea19adcd1def0a858002e Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Tue, 25 Jul 2023 15:45:11 +0200 Subject: [PATCH] chore: ci and repo links --- .gitea/workflows/release.yaml | 31 +++++++++++++++++-------------- CHANGELOG.md | 4 ++++ package.json | 2 +- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 0811d6d..0678f4a 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -25,14 +25,14 @@ jobs: - name: Install ZIP and SASjs CLI run: | apt-get update - apt-get install zip + apt-get install zip -y npm i -g @sasjs/cli # test - name: Install JQ for parsing JSON run: | apt-get update - apt-get install jq + apt-get install jq -y - name: Install Semantic Release and plugins and create Release run: | @@ -40,6 +40,12 @@ jobs: npm i -g semantic-release GITEA_TOKEN=${{ secrets.RELEASE_TOKEN }} GITEA_URL=https://git.datacontroller.io semantic-release + - name: Frontend Build + run: | + cd client + npm ci + npm run build + - name: Build SAS9 EBI Release description: compile SAS 9 services, remove tests & create deployment program run: | @@ -82,15 +88,6 @@ jobs: sasjs b -t viya cp sasjsbuild/viya.sas ./viya.sas - - name: Frontend Build - run: | - cd client - npm ci - # Disabled to speed up dev process - # npm run build - # zip -r dist.zip ./dist - touch dist.zip - - name: Zip Frontend (including viya.json for full viya deploy) run: | cd sas @@ -104,7 +101,13 @@ jobs: npm run typedoc # deploy docs - - name: Upload artifacts to release + - name: Upload assets to release run: | - RELEASE_ID=`curl -k 'https://git.datacontroller.io/api/v1/repos/mihajlo/dc_throwaway/releases/latest?access_token=${{ secrets.RELEASE_TOKEN }}' | jq -r '.id'` - curl -k https://git.datacontroller.io/api/v1/repos/mihajlo/dc_throwaway/releases/$RELEASE_ID/assets?access_token=${{ secrets.RELEASE_TOKEN }} -F attachment=@frontend.zip + RELEASE_ID=`curl -k 'https://git.datacontroller.io/api/v1/repos/dc/dc/releases/latest?access_token=${{ secrets.RELEASE_TOKEN }}' | jq -r '.id'` + URL="https://git.datacontroller.io/api/v1/repos/dc/dc/releases/$RELEASE_ID/assets?access_token=${{ secrets.RELEASE_TOKEN }}" + curl -k $URL -F attachment=@frontend.zip + curl -k $URL -F attachment=@sas/demostream_sas9.sas + curl -k $URL -F attachment=@sas/demostream_viya.sas + curl -k $URL -F attachment=@sas/sasjs_server.json.zip + curl -k $URL -F attachment=@sas/sas9.sas + curl -k $URL -F attachment=@sas/viya.sas diff --git a/CHANGELOG.md b/CHANGELOG.md index e1e8ab7..c49fad8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# Changelog + +All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. + ## [6.0.0](https://gitlab.com/macropeople/datacontroller/compare/v5.3.0...v6.0.0) (2023-06-27) diff --git a/package.json b/package.json index 26f9236..ece5ff0 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,6 @@ }, "repository": { "type": "git", - "url": "https://git.datacontroller.io/mihajlo/dc_throwaway.git" + "url": "https://git.datacontroller.io/dc/dc.git" } }