refactoring

bia-technologies · Aug 27, 2023 · d5d8cee · d5d8cee
1 parent d423477
commit d5d8cee
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
@@ -2,6 +2,9 @@ name: Build and test
 on:
  push:
  branches: [ feature/**, develop ]
+ pull_request:
+ branches: [ develop ]
+
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: true

diff --git a/.github/workflows/run-tests-linux.yml b/.github/workflows/run-tests-linux.yml
@@ -7,23 +7,28 @@ on:
  description: 'Platform version'
  type: string
  required: true
+
  locale:
  type: string
  required: false
  default: ru_RU
+
  artifact_name:
  type: string
  required: true
+
  fail_on_failure:
  type: boolean
  required: false
  default: true
+
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.v8_version }}-${{ inputs.locale }}-Linux
  cancel-in-progress: true
+
 jobs:
  execute-tests:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
  steps:
 
  - name: download artifact
@@ -110,8 +115,7 @@ jobs:
  timeout-minutes: 5
 
  - name: run server
- run: |
- ibsrv --db-path=file-db --daemon
+ run: ibsrv --db-path=file-db --daemon
 
  - name: create test-config
  uses: DamianReeves/write-file-action@master
@@ -126,12 +130,12 @@ jobs:
  }
  
  - name: run tests
- run: |
- export DISPLAY=:99
- export LANG=${{ inputs.locale }}.UTF-8
- 1cv8c /WS "http://localhost:8314" /C"RunUnitTests=${{github.workspace}}/unit.json" /DisableStartupDialogs /DisableStartupMessages /DisableUnrecoverableErrorMessage /Out output.log
+ run: 1cv8c /WS "http://localhost:8314" /C"RunUnitTests=${{github.workspace}}/unit.json" /DisableStartupDialogs /DisableStartupMessages /DisableUnrecoverableErrorMessage /Out output.log
  timeout-minutes: 5
-
+ env:
+ DISPLAY: :99
+ LANG: "${{ inputs.locale }}.UTF-8"
+
  - name: view output
  if: always()
  run: cat output.log

diff --git a/.github/workflows/run-tests-macos.yml b/.github/workflows/run-tests-macos.yml
@@ -7,16 +7,20 @@ on:
  description: 'Platform version'
  type: string
  required: true
+
  locale:
  type: string
  required: false
  default: ru_RU
+
  artifact_name:
  type: string
  required: true
+
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.v8_version }}-${{ inputs.locale }}-MacOS
  cancel-in-progress: true
+
 jobs:
  execute-tests:
  runs-on: macos-latest

diff --git a/.github/workflows/run-tests-windows.yml b/.github/workflows/run-tests-windows.yml
@@ -7,16 +7,20 @@ on:
  description: 'Platform version'
  type: string
  required: true
+
  locale:
  type: string
  required: false
  default: ru_RU
+
  artifact_name:
  type: string
  required: true
+
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.v8_version }}-${{ inputs.locale }}-Windows
  cancel-in-progress: true
+
 jobs:
  execute-tests:
  runs-on: windows-latest