Skip to content

Commit

Permalink
Update large-tests.yaml
Browse files Browse the repository at this point in the history
Update Makefile

Update build.yaml

Update wait-and-test.sh
  • Loading branch information
dmihalcik-virtru committed Nov 7, 2024
1 parent 614e086 commit 9bbaa80
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ env:
github.event.pull_request.head.repo.full_name == github.repository }}
on:
pull_request:
# pull_request:
push:
branches:
- main
- release/[0-9]+.[0-9]+.[0-9]+
release:
types:
- created
# - release/[0-9]+.[0-9]+.[0-9]+
# release:
# types:
# - created
jobs:
lib:
runs-on: ubuntu-latest
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/large-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ on:
jobs:
large-file-test:
runs-on: ubuntu-latest
defaults:
run:
working-directory: .github/workflows/roundtrip
timeout-minutes: 120
steps:
- uses: actions/checkout@v4
Expand All @@ -26,7 +23,9 @@ jobs:
- name: run platform
uses: opentdf/platform/test/start-up-with-containers@main
- run: docker compose up -d --wait --wait-timeout 240
working-directory: .github/workflows/roundtrip
- env:
PLAYWRIGHT_TESTS_TO_RUN: huge roundtrip
run: |-
./wait-and-test.sh platform
working-directory: .github/workflows/roundtrip
3 changes: 2 additions & 1 deletion .github/workflows/roundtrip/wait-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ _configure_app() {
echo "[ERROR] Couldn't ci roundtrip command line app"
return 1
fi
if ! npm i "../../../cli/opentdf-ctl-${app_version}.tgz"; then
if ! npm i "${ROOT_DIR}/cli/opentdf-ctl-${app_version}.tgz"; then
echo "[ERROR] Couldn't install current command line app"
return 1
fi
return 0
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ i:
(cd lib && npm i && npm pack)
for x in $(extras); do (cd $$x && npm uninstall @opentdf/sdk && npm i && npm i ../lib/opentdf-sdk-$(version).tgz) || exit 1; done

all: ci lib/opentdf-sdk-$(version).tgz web-app/opentdf-web-app-$(version).tgz
all: ci lib/opentdf-sdk-$(version).tgz cli/opentdf-ctl-$(version).tgz web-app/opentdf-web-app-$(version).tgz

cli/opentdf-ctl-$(version).tgz: lib/opentdf-sdk-$(version).tgz $(shell find cli -not -path '*/dist*' -and -not -path '*/coverage*' -and -not -path '*/node_modules*')
(cd cli && npm uninstall @opentdf/sdk && npm ci && npm i ../lib/opentdf-sdk-$(version).tgz && npm pack)
Expand Down

0 comments on commit 9bbaa80

Please sign in to comment.