Skip to content

Commit

Permalink
Fix Linux build and origin repository detection in CI Build
Browse files Browse the repository at this point in the history
  • Loading branch information
egorodet committed Oct 14, 2023
1 parent d9c9010 commit 8b9ad77
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ env:
product_ver_build: ${{ github.run_number }}
tracy_release_version: "0.9.1"
vulkan_sdk_version: "1.3.250.1"
is_origin_repository: ${{ github.repository == 'MethanePowered/MethaneKit' }}
origin_repository: 'MethanePowered/MethaneKit'
# TSC Invariant check is disabled to allow running Catch test executables only for tests list query by CTest
TRACY_NO_INVARIANT_CHECK: 1

Expand Down Expand Up @@ -207,13 +207,15 @@ jobs:

- name: Install Linux prerequisites
if: ${{ matrix.os_name == 'Ubuntu' }}
run: sudo apt install xcb libx11-dev libx11-xcb-dev libxcb-sync-dev libxcb-randr0-dev p7zip
run:
sudo apt update
sudo apt install xcb libx11-dev libx11-xcb-dev libxcb-sync-dev libxcb-randr0-dev p7zip

- name: Checkout repository
uses: actions/checkout@v3

- name: Install Testspace
if: ${{ env.is_origin_repository }}
if: ${{ github.repository == env.origin_repository }}
uses: testspace-com/setup-testspace@v1
with:
domain: ${{ github.repository_owner }}
Expand Down Expand Up @@ -316,7 +318,7 @@ jobs:
path: ${{ env.INSTALL_DIR }}/Tests/*_result.xml

- name: Upload Test Results and Build Log to Testspace server
if: ${{ env.is_origin_repository && matrix.run_tests && (success() || failure()) }}
if: ${{ github.repository == env.origin_repository && matrix.run_tests && (success() || failure()) }}
run: testspace "[ ${{ matrix.name }} ]${{ env.INSTALL_DIR }}/Tests/*_result.xml" "[ ${{ matrix.name }} ]${{ env.BUILD_LOG_FILE }}"

- name: Add README and BUILD files
Expand Down Expand Up @@ -361,7 +363,7 @@ jobs:

- name: Update Badge Parameters
id: badge-params
if: ${{ env.is_origin_repository && github.event_name == 'push' && always() }}
if: ${{ github.repository == env.origin_repository && github.event_name == 'push' && always() }}
shell: bash
run: |
case "${{ job.status }}" in
Expand All @@ -384,7 +386,7 @@ jobs:
esac
- name: Update Badge JSON
if: ${{ env.is_origin_repository && github.event_name == 'push' && always() }}
if: ${{ github.repository == env.origin_repository && github.event_name == 'push' && always() }}
uses: schneegans/[email protected] # https://github.com/marketplace/actions/dynamic-badges
with:
auth: ${{ secrets.GIST_TOKEN }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ci-codeql-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ jobs:

- name: Install Linux prerequisites
if: ${{ matrix.os == 'ubuntu-latest' }}
run: sudo apt install xcb libx11-dev libx11-xcb-dev libxcb-sync-dev libxcb-randr0-dev
run:
sudo apt update
sudo apt install xcb libx11-dev libx11-xcb-dev libxcb-sync-dev libxcb-randr0-dev

- name: Checkout repository
uses: actions/checkout@v3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ci-sonar-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ jobs:

- name: Install Linux prerequisites
if: ${{ matrix.os_name == 'linux' }}
run: sudo apt install xcb libx11-dev libx11-xcb-dev libxcb-sync-dev libxcb-randr0-dev lcov
run:
sudo apt update
sudo apt install xcb libx11-dev libx11-xcb-dev libxcb-sync-dev libxcb-randr0-dev lcov

- name: Install Testspace
uses: testspace-com/setup-testspace@v1
Expand Down

7 comments on commit 8b9ad77

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Win32_DX_Release Test Results

  • ✅ 0 tests passed
  • ❌ 0 tests failed
  • ⚠️ 0 tests skipped
  • ⏱️ 0 ms. run duration

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Win64_DX_Release Test Results

  • ✅ 0 tests passed
  • ❌ 0 tests failed
  • ⚠️ 0 tests skipped
  • ⏱️ 0 ms. run duration

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Win32_VK_Release Test Results

  • ✅ 0 tests passed
  • ❌ 0 tests failed
  • ⚠️ 0 tests skipped
  • ⏱️ 0 ms. run duration

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Win64_VK_Release Test Results

  • ✅ 0 tests passed
  • ❌ 0 tests failed
  • ⚠️ 0 tests skipped
  • ⏱️ 0 ms. run duration

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ubuntu_VK_Release Test Results

  • ✅ 0 tests passed
  • ❌ 0 tests failed
  • ⚠️ 0 tests skipped
  • ⏱️ 0 ms. run duration

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MacOS_MTL_Release Test Results

  • ✅ 0 tests passed
  • ❌ 0 tests failed
  • ⚠️ 0 tests skipped
  • ⏱️ 0 ms. run duration

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MacOS_VK_Release Test Results

  • ✅ 0 tests passed
  • ❌ 0 tests failed
  • ⚠️ 0 tests skipped
  • ⏱️ 0 ms. run duration

Please sign in to comment.