Skip to content

Commit

Permalink
Merge branch 'main' into drop_codecov
Browse files Browse the repository at this point in the history
  • Loading branch information
sjd78 authored Feb 7, 2025
2 parents 4a9d4c8 + 671968b commit 3ef585a
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 26 deletions.
25 changes: 13 additions & 12 deletions .github/workflows/ci-global.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,25 @@ concurrency:
jobs:
build-and-upload-for-global-ci:
runs-on: ubuntu-latest
outputs:
IMG_NAME: ${{ steps.container.outputs.IMG_NAME }}
steps:
- uses: actions/checkout@v4

- name: save tackle2-ui image
- id: container
name: build the tackle2-ui container
env:
IMG_NAME: ttl.sh/tackle2-ui-${{ github.sha }}:2h
run: |
docker build . -t quay.io/konveyor/tackle2-ui:latest
docker save -o /tmp/tackle2-ui.tar quay.io/konveyor/tackle2-ui:latest
- name: Upload tackle2-ui image as artifact
uses: actions/upload-artifact@v4
with:
name: tackle2-ui
path: /tmp/tackle2-ui.tar
retention-days: 1
echo "IMG_NAME=${IMG_NAME}" >> "$GITHUB_OUTPUT"
docker build . -t ${IMG_NAME}
docker push ${IMG_NAME}
run-global-ci:
needs: build-and-upload-for-global-ci
uses: konveyor/ci/.github/workflows/global-ci.yml@main
uses: konveyor/ci/.github/workflows/global-ci-bundle.yml@main
with:
component_name: tackle2-ui
tackle_ui: ${{ needs.build-and-upload-for-global-ci.outputs.IMG_NAME }}
run_api_tests: false
run_ui_tests: true
ui_test_tags: "@tier0"
3 changes: 3 additions & 0 deletions client/config/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ const config: JestConfigWithTsJest = {
transform: {
"^.+\\.(js|mjs|ts|mts)x?$": "ts-jest",
},
transformIgnorePatterns: [
"node_modules/(?!(keycloak-js)/)", // Ensure Jest processes keycloak-js
],

// Code to set up the testing framework before each test file in the suite is executed
setupFilesAfterEnv: ["<rootDir>/src/app/test-config/setupTests.ts"],
Expand Down
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"i18next": "^19.8.4",
"i18next-http-backend": "^1.0.22",
"js-yaml": "^4.1.0",
"keycloak-js": "^18.0.1",
"keycloak-js": "^26.1.0",
"radash": "^12.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
21 changes: 8 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3ef585a

Please sign in to comment.