Skip to content

Commit

Permalink
Move Keycloak JS into the NPM workspace (keycloak#17401)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonkoops authored Mar 3, 2023
1 parent 972ebb9 commit 6d2e57f
Show file tree
Hide file tree
Showing 33 changed files with 1,353 additions and 2,457 deletions.
3 changes: 0 additions & 3 deletions .github/actions/conditional/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ outputs:
codeql-themes:
description: Should "codeql-analysis.yml / themes" execute
value: ${{ steps.changes.outputs.codeql-themes }}
codeql-js_adapter:
description: Should "codeql-analysis.yml / js-adapter" execute
value: ${{ steps.changes.outputs.codeql-js_adapter }}
docs:
description: Should "docs.yml" execute
value: ${{ steps.changes.outputs.docs }}
Expand Down
5 changes: 2 additions & 3 deletions .github/actions/conditional/conditions
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
#
# To test a pattern run '.github/actions/conditional/conditional.sh <remote name> <branch>'

.github/actions/ ci operator js codeql-java codeql-themes codeql-js_adapter
.github/actions/ ci operator js codeql-java codeql-themes

.github/workflows/ci.yml ci
.github/workflows/operator-ci.yml operator
.github/workflows/js-ci.yml js
.github/workflows/codeql-analysis.yml codeql-java codeql-themes codeql-js_adapter
.github/workflows/codeql-analysis.yml codeql-java codeql-themes

*/src/main/ ci operator
*/src/test/ ci operator
Expand All @@ -19,4 +19,3 @@ js/ js

*.java codeql-java
themes/ codeql-themes
adapters/oidc/js/ codeql-js_adapter
38 changes: 1 addition & 37 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
outputs:
java: ${{ steps.conditional.outputs.codeql-java }}
themes: ${{ steps.conditional.outputs.codeql-themes }}
js-adapter: ${{ steps.conditional.outputs.codeql-js_adapter }}
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -64,35 +63,6 @@ jobs:
- id: check
uses: ./.github/actions/checks-success

js-adapter:
name: CodeQL JavaScript Adapter
needs: conditional
runs-on: ubuntu-latest
if: needs.conditional.outputs.js-adapter == 'true'
outputs:
conclusion: ${{ steps.check.outputs.conclusion }}

steps:
- uses: actions/checkout@v3

- name: Initialize CodeQL
uses: github/codeql-action/init@v2.2.5
env:
CODEQL_ACTION_EXTRA_OPTIONS: '{"database":{"finalize":["--no-run-unnecessary-builds"]}}'
with:
languages: javascript
source-root: adapters/oidc/js/src/

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2.2.5
with:
wait-for-processing: true
env:
CODEQL_ACTION_EXTRA_OPTIONS: '{"database":{"interpret-results":["--max-paths",0]}}'

- id: check
uses: ./.github/actions/checks-success

themes:
name: CodeQL Themes
needs: conditional
Expand Down Expand Up @@ -125,7 +95,7 @@ jobs:
check:
name: Status Check - CodeQL
if: always() && ( github.event_name != 'schedule' || github.repository == 'keycloak/keycloak' )
needs: [conditional, java, js-adapter, themes]
needs: [conditional, java, themes]
runs-on: ubuntu-latest

steps:
Expand All @@ -137,12 +107,6 @@ jobs:
required: ${{ needs.conditional.outputs.java }}
conclusion: ${{ needs.java.outputs.conclusion }}

- name: CodeQL JavaScript Adapter
uses: ./.github/actions/checks-job-pass
with:
required: ${{ needs.conditional.outputs.js-adapter }}
conclusion: ${{ needs.js-adapter.outputs.conclusion }}

- name: CodeQL Themes
uses: ./.github/actions/checks-job-pass
with:
Expand Down
4 changes: 0 additions & 4 deletions adapters/oidc/js/.gitignore

This file was deleted.

Loading

0 comments on commit 6d2e57f

Please sign in to comment.