Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into mdc/julia_version_control
Browse files Browse the repository at this point in the history
  • Loading branch information
jmlord committed Dec 14, 2023
2 parents 631df11 + 289f79e commit d795ed2
Show file tree
Hide file tree
Showing 258 changed files with 225 additions and 64,197 deletions.
26 changes: 0 additions & 26 deletions .github/findDuplicateDescriptions.sh

This file was deleted.

21 changes: 0 additions & 21 deletions .github/findDuplicateIds.sh

This file was deleted.

39 changes: 0 additions & 39 deletions .github/workflows/docker_script-server.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/docker_ui.yml

This file was deleted.

66 changes: 19 additions & 47 deletions .github/workflows/onPush.yml
Original file line number Diff line number Diff line change
@@ -1,59 +1,31 @@
name: On push, any branch

on: [push]

# TODO change pipeline-repo-actions to main
jobs:
run-script-server-test:
run-yml-validation:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/checkout@v4
with:
java-version: '11'
distribution: 'adopt'
# Repository name with owner. For example, actions/checkout
# Default: ${{ github.repository }}
repository: 'GEO-BON/bon-in-a-box-pipeline-engine.git'

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
# The branch, tag or SHA to checkout. When checking out the repository that
# triggered a workflow, this defaults to the reference or SHA for that event.
# Otherwise, uses the default branch.
ref: 'main'

- name: Gradle build & test
uses: gradle/gradle-build-action@v2
with:
arguments: build --info
build-root-directory: script-server

- name: Save test results
uses: actions/upload-artifact@v3
if: always()
with:
name: Test results
path: script-server/build/reports/tests/test/
# Relative path under $GITHUB_WORKSPACE to place the repository
path: '.server'


run-yml-validation:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: YML file syntax validation
uses: navikt/yaml-validator@v4
with:
schema_path: scripts/cerberusValidationSchema
document_path: scripts
validate_file_extension: no
filter_extensions: .yml
- name: YML test files syntax validation
uses: navikt/yaml-validator@v4
with:
schema_path: scripts/cerberusValidationSchema
document_path: script-server/src/test/resources/scripts/
validate_file_extension: no
filter_extensions: .yml
- name: Find duplicate lines inside same step YML file
working-directory: ./scripts
run: ../.github/findDuplicateDescriptions.sh
- name: Creating empty runner.env
working-directory: .
run: touch runner.env
shell: bash
- name: Find duplicate lines inside same pipeline JSON file
working-directory: ./pipelines
run: ../.github/findDuplicateIds.sh
- name: Script and pipelines basic validation
working-directory: .
run: .server/prod-server.sh validate
shell: bash
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.env
runner.env
.Rproj.user
.Rhistory
.vscode
**/.cache
**/.config
.server
135 changes: 0 additions & 135 deletions README-dev.md

This file was deleted.

Loading

0 comments on commit d795ed2

Please sign in to comment.