diff --git a/.gitea/workflows/development-test.yaml b/.gitea/workflows/development-test.yaml index 088e569..772a71e 100644 --- a/.gitea/workflows/development-test.yaml +++ b/.gitea/workflows/development-test.yaml @@ -77,6 +77,17 @@ jobs: # Start frontend and run cypress npm start & npx wait-on http://localhost:4200 && npx cypress run --browser chrome --spec "cypress/e2e/liveness.cy.ts,cypress/e2e/editor.cy.ts,cypress/e2e/excel.cy.ts,cypress/e2e/filtering.cy.ts,cypress/e2e/licensing.cy.ts" + - name: Zip Cypress videos + if: always() + run: | + zip -r cypress-videos ./client/cypress/videos + + - name: Cypress videos artifacts + uses: actions/upload-artifact@v3 + with: + name: cypress-videos.zip + path: cypress-videos.zip + Build-and-test-development-latest-adapter: runs-on: ubuntu-latest @@ -125,7 +136,6 @@ jobs: npm install -g @sasjs/cli npm install -g replace-in-files-cli sasjs cbd -t server-ci - # sasjs request services/admin/makedata -t server-ci -d ./deploy/makeData4GL.json -c ./deploy/requestConfig.json -o ./output.json - name: Install ZIP run: | @@ -148,4 +158,15 @@ jobs: replace-in-files --regex='"hosturl".*' --replacement='hosturl:"http://localhost:4200",' ./cypress.config.ts cat ./cypress.config.ts # Start frontend and run cypress - npm start & npx wait-on http://localhost:4200 && npx cypress run --browser chrome --spec "cypress/e2e/liveness.cy.ts,cypress/e2e/editor.cy.ts,cypress/e2e/excel.cy.ts,cypress/e2e/filtering.cy.ts,cypress/e2e/licensing.cy.ts" \ No newline at end of file + npm start & npx wait-on http://localhost:4200 && npx cypress run --browser chrome --spec "cypress/e2e/liveness.cy.ts,cypress/e2e/editor.cy.ts,cypress/e2e/excel.cy.ts,cypress/e2e/filtering.cy.ts,cypress/e2e/licensing.cy.ts" + + - name: Zip Cypress videos + if: always() + run: | + zip -r cypress-videos ./client/cypress/videos + + - name: Cypress videos artifacts + uses: actions/upload-artifact@v3 + with: + name: cypress-videos-latest-adapter.zip + path: cypress-videos.zip \ No newline at end of file diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 39fdc45..e1fdbc5 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -27,7 +27,6 @@ jobs: apt-get update apt-get install zip -y npm i -g @sasjs/cli - # test - name: Install JQ for parsing JSON run: | diff --git a/client/src/environments/_eula.ts b/client/src/environments/_eula.ts index c4e6412..684dea6 100644 --- a/client/src/environments/_eula.ts +++ b/client/src/environments/_eula.ts @@ -5,27 +5,17 @@ Licence Agreement for Data Controller for SAS® Copyright (c) Bowe IO Ltd -Data Controller is a software distributed by 4GL Apps, a brand owned by Bowe IO Ltd, a UK Limited Company headquarted in 29 Oldfield Rd, Cumbria, registered by companies house under number 08777171, VAT number: 203914240 +Data Controller software is distributed by 4GL Apps, a brand owned by Bowe IO Ltd, a UK Limited Company headquarted in 29 Oldfield Rd, Cumbria, registered at Companies House with company number 08777171, VAT number: 203914240 -This software is protected by applicable copyright laws, including international treaties, and dual- -licensed – depending on whether your use for commercial purposes, meaning intended for or -resulting in commercial advantage or monetary compensation, or not. +This software is protected by applicable copyright laws, including international treaties, and dual-licensed – depending on whether your use for commercial purposes, meaning intended for or resulting in commercial advantage or monetary compensation, or not. -If your use is strictly personal or solely for evaluation purposes, meaning for the purposes of testing -the suitability, performance, and usefulness of this software outside the production environment, -you agree to be bound by the terms included in the "licence-non-commercial-datacontroller.md" file. +If your use is strictly personal or solely for evaluation purposes, meaning for the purposes of testing the suitability, performance, and usefulness of this software outside the production environment, you agree to be bound by the terms included in the "licence-non-commercial-datacontroller.md" file available here: https://git.datacontroller.io/dc/dc/src/branch/main/licence-non-commercial-datacontroller.md -Your use of this software for commercial purposes is subject to the terms included in an applicable -license agreement. +Your use of this software for commercial purposes is subject to the terms included in an applicable license agreement. -In any case, you must not make any such use of this software as to develop software which may be -considered competitive with this software. +In any case, you must not make any such use of this software as to develop software which may be considered competitive with this software. -UNLESS EXPRESSLY AGREED OTHERWISE, 4GL APPS PROVIDES THIS SOFTWARE ON AN "AS IS" -BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, AND IN NO EVENT AND UNDER NO -LEGAL THEORY, SHALL 4GL APPS BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY DIRECT, -INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER ARISING FROM -USE OR INABILITY TO USE THIS SOFTWARE. +UNLESS EXPRESSLY AGREED OTHERWISE, 4GL APPS PROVIDES THIS SOFTWARE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, AND IN NO EVENT AND UNDER NO LEGAL THEORY, SHALL 4GL APPS BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER ARISING FROM USE OR INABILITY TO USE THIS SOFTWARE. `