diff --git a/.github/workflows/build.lazarus.yml b/.github/workflows/build.lazarus.yml index 325f500..c9242df 100644 --- a/.github/workflows/build.lazarus.yml +++ b/.github/workflows/build.lazarus.yml @@ -26,7 +26,7 @@ on: jobs: build-app: - name: build-${{ matrix.os }}-${{ matrix.lazarus-versions }} + name: build-[${{ matrix.os }}][${{ matrix.lazarus-versions }}] runs-on: ${{ matrix.os }} env: diff --git a/.github/workflows/main.lazarus.yml b/.github/workflows/main.lazarus.yml index cb9580e..f0a0c2b 100644 --- a/.github/workflows/main.lazarus.yml +++ b/.github/workflows/main.lazarus.yml @@ -63,7 +63,7 @@ jobs: "lpi-path": "lazarus/tests", "bin-path": "lazarus/bin", "build-mode": "Release", - "what-tests": "all", + "what-suite": "all", "output-format": "plain", "matrix": { "os":[ diff --git a/.github/workflows/release.lazarus.yml b/.github/workflows/release.lazarus.yml index 308f40a..8884cf2 100644 --- a/.github/workflows/release.lazarus.yml +++ b/.github/workflows/release.lazarus.yml @@ -16,7 +16,7 @@ on: jobs: release-app: - name: release + name: release-[${{ fromJSON(inputs.config).tag }}] runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.lazarus.yml b/.github/workflows/test.lazarus.yml index bf82b7a..1445b9a 100644 --- a/.github/workflows/test.lazarus.yml +++ b/.github/workflows/test.lazarus.yml @@ -16,7 +16,7 @@ on: jobs: test-app: - name: test-${{ matrix.os }}-${{ matrix.lazarus-versions }} + name: test-[${{ matrix.os }}][${{ matrix.lazarus-versions }}] runs-on: ${{ matrix.os }} env: @@ -36,7 +36,7 @@ jobs: echo "lpi-path=${{ fromJSON(inputs.config).lpi-path }}" >> "$GITHUB_ENV" echo "bin-path=${{ fromJSON(inputs.config).bin-path }}" >> "$GITHUB_ENV" echo "build-mode=${{ fromJSON(inputs.config).build-mode }}" >> "$GITHUB_ENV" - echo "what-tests=${{ fromJSON(inputs.config).what-tests }}" >> "$GITHUB_ENV" + echo "what-suite=${{ fromJSON(inputs.config).what-suite }}" >> "$GITHUB_ENV" echo "output-format=${{ fromJSON(inputs.config).output-format }}" >> "$GITHUB_ENV" - name: Checkout Repository @@ -54,7 +54,12 @@ jobs: run: lazbuild -B --bm="${{ env.build-mode }}" "${{ env.lpi-path }}/${{ env.app-name }}.lpi" - name: Run the tests - run: ${{ env.bin-path }}/${{ env._EXE_ }} + run: | + if [ "${{ env.what-suite }}" == "all" ];then + ${{ env.bin-path }}/${{ env._EXE_ }} --all --format="${{ env.output-format }}" + else + ${{ env.bin-path }}/${{ env._EXE_ }} --suite="${{ env.what-suite }}" --format="${{ env.output-format }}" + fi # - name: Print some values # run: |