CI: Improve and fix

This commit is contained in:
SirLynix 2022-04-30 15:12:50 +02:00
parent 1ba3655869
commit 5400b49180
5 changed files with 38 additions and 13 deletions

View File

@ -28,7 +28,12 @@ jobs:
if: "!contains(github.event.head_commit.message, 'coverage skip')" if: "!contains(github.event.head_commit.message, 'coverage skip')"
steps: steps:
- uses: actions/checkout@v2 - name: Get current date as package key
id: pkg_key
run: echo "::set-output name=key::$(date +'%w')"
- name: Checkout repository
uses: actions/checkout@v3
# Install system dependencies # Install system dependencies
- name: Install system dependencies (Linux) - name: Install system dependencies (Linux)
@ -67,15 +72,15 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
key: Linux-${{ matrix.config.arch }}-debug-${{ steps.dep_hash.outputs.hash }}-$(date +'%w') key: Linux-${{ matrix.config.arch }}-debug-${{ steps.dep_hash.outputs.hash }}-${{ steps.pkg_key.outputs.key }}
# Cache xmake dependencies # Cache xmake dependencies
- name: Retrieve cached xmake dependencies (Windows) - name: Retrieve cached xmake dependencies (Windows)
if: runner.os == 'Windows' if: runner.os == 'Windows'
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages
key: MSVC-${{ matrix.config.arch }}-releasedbg-${{ steps.dep_hash.outputs.hash }}-$(date +'%w') key: MSVC-${{ matrix.config.arch }}-releasedbg-${{ steps.dep_hash.outputs.hash }}-${{ steps.pkg_key.outputs.key }}
# Setup compilation mode and install project dependencies # Setup compilation mode and install project dependencies
- name: Configure xmake and install dependencies - name: Configure xmake and install dependencies

View File

@ -27,7 +27,12 @@ jobs:
if: "!contains(github.event.head_commit.message, 'ci skip')" if: "!contains(github.event.head_commit.message, 'ci skip')"
steps: steps:
- uses: actions/checkout@v2 - name: Get current date as package key
id: pkg_key
run: echo "::set-output name=key::$(date +'%w')"
- name: Checkout repository
uses: actions/checkout@v3
# Install system dependencies # Install system dependencies
- name: Install system dependencies - name: Install system dependencies
@ -59,7 +64,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-$(date +'%w') key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-${{ steps.pkg_key.outputs.key }}
# Setup compilation mode and install project dependencies # Setup compilation mode and install project dependencies
- name: Configure xmake and install dependencies - name: Configure xmake and install dependencies

View File

@ -27,7 +27,12 @@ jobs:
if: "!contains(github.event.head_commit.message, 'ci skip')" if: "!contains(github.event.head_commit.message, 'ci skip')"
steps: steps:
- uses: actions/checkout@v2 - name: Get current date as package key
id: pkg_key
run: echo "::set-output name=key::$(date +'%w')"
- name: Checkout repository
uses: actions/checkout@v3
# Force xmake to a specific folder (for cache) # Force xmake to a specific folder (for cache)
- name: Set xmake env - name: Set xmake env
@ -53,7 +58,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
key: macOS-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-$(date +'%w') key: macOS-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-${{ steps.pkg_key.outputs.key }}
# Setup compilation mode and install project dependencies # Setup compilation mode and install project dependencies
- name: Configure xmake and install dependencies - name: Configure xmake and install dependencies

View File

@ -32,7 +32,12 @@ jobs:
shell: msys2 {0} shell: msys2 {0}
steps: steps:
- uses: actions/checkout@v2 - name: Get current date as package key
id: pkg_key
run: echo "::set-output name=key::$(date +'%w')"
- name: Checkout repository
uses: actions/checkout@v3
# Setup MSYS2 # Setup MSYS2
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
@ -51,7 +56,7 @@ jobs:
id: xmake_cache id: xmake_cache
with: with:
path: ${{ github.workspace }}/xmake_git path: ${{ github.workspace }}/xmake_git
key: MinGW-XMake-$(date +'%w') key: MinGW-XMake-${{ steps.pkg_key.outputs.key }}
# Build xmake # Build xmake
- name: Setup xmake - name: Setup xmake
@ -82,7 +87,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
key: MinGW-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-$(date +'%w') key: MinGW-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-${{ steps.pkg_key.outputs.key }}
# Setup compilation mode and install project dependencies # Setup compilation mode and install project dependencies
- name: Configure xmake and install dependencies - name: Configure xmake and install dependencies

View File

@ -27,7 +27,12 @@ jobs:
if: "!contains(github.event.head_commit.message, 'ci skip')" if: "!contains(github.event.head_commit.message, 'ci skip')"
steps: steps:
- uses: actions/checkout@v2 - name: Get current date as package key
id: pkg_key
run: echo "::set-output name=key::$(date +'%w')"
- name: Checkout repository
uses: actions/checkout@v3
# Force xmake to a specific folder (for cache) # Force xmake to a specific folder (for cache)
- name: Set xmake env - name: Set xmake env
@ -53,7 +58,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages
key: MSVC-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-$(date +'%w') key: MSVC-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-${{ steps.pkg_key.outputs.key }}
# Setup compilation mode and install project dependencies # Setup compilation mode and install project dependencies
- name: Configure xmake and install dependencies - name: Configure xmake and install dependencies