Skip to content

Commit

Permalink
Merge pull request #12 from SoftwareAG/feature-migration-1019
Browse files Browse the repository at this point in the history
Feature migration 1019
  • Loading branch information
ck-c8y authored Feb 15, 2024
2 parents f7c2612 + ade7ce9 commit 3bea646
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ jobs:
retention-days: 1
path: |
analytics-ui/build.zip
build_service:
needs: [build_ui]

Expand Down Expand Up @@ -110,7 +109,6 @@ jobs:
- name: Build backend
run: |
./build.sh analytics-ext-service ${{ needs.build_ui.outputs.version }}
- name: Upload build artifact service
uses: actions/upload-artifact@v3
with:
Expand All @@ -119,7 +117,6 @@ jobs:
retention-days: 1
path: |
./analytics-service/dist/analytics-ext-service.zip
release-assets:
needs: [build_ui, build_service]
# if: ${{ needs.release.outputs.initial-version != needs.release.outputs.version }}
Expand All @@ -137,7 +134,6 @@ jobs:
run: |
ls -lah ./analytics-service
pwd
- name: Release Backend
uses: softprops/action-gh-release@v1
with:
Expand All @@ -156,7 +152,6 @@ jobs:
mv ./analytics-ui/build.zip ./analytics-ui/sag-ps-pkg-analytics-extension-${{ needs.build_ui.outputs.version }}.zip
ls -lah ./analytics-ui
pwd
- name: Release UI
uses: softprops/action-gh-release@v1
with:
Expand Down
3 changes: 2 additions & 1 deletion analytics-ui/cumulocity.config.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { EnvironmentOptions } from "@c8y/devkit/dist/options";
import { author, description, version } from "./package.json";
import { author, description, version, license } from "./package.json";

export default {
runTime: {
author,
description,
license,
version,
name: "Analytics Extension", // key for repository connect
contextPath: "sag-ps-pkg-analytics-extension", // key for repository connect
Expand Down
3 changes: 1 addition & 2 deletions analytics-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"start:ab": "npm start -- --shell streaminganalytics",
"start:cockpit": "npm start -- --shell cockpit",
"build": "ng build",
"deploy": "ng deploy",
"locale-extract": "c8ycli locale-extract"
"deploy": "ng deploy"
},
"keywords": [
"c8y"
Expand Down

0 comments on commit 3bea646

Please sign in to comment.