Merge pull request #144 from pkendall64/github-workflow-updates

Github workflow updates
ExpressLRS · Jul 25, 2024 · 8cfadbc · 8cfadbc
2 parents ad85322 + 8d7f3c9
commit 8cfadbc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
@@ -8,7 +8,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  fetch-depth: 0
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ jobs:
  targets: ${{ steps.set-targets.outputs.targets }}
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - id: set-targets
  run: echo "targets=[$(grep -r "\[env:" targets | sed 's/.*://' | sed s/.$// | egrep "UART" | tr '\n' ',' | sed 's/,$/"\n/' | sed 's/,/","/'g | sed 's/^/"/')]" >> $GITHUB_OUTPUT
 
@@ -24,15 +24,15 @@ jobs:
  uses: rlespinasse/github-slug-action@v4
 
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Set up Python
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: '3.10'
 
  - name: Cache pip
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: ~/.cache/pip
  key: ${{ runner.os }}-pip-${{ matrix.target }}
@@ -44,7 +44,7 @@ jobs:
  pip install wheel
 
  - name: Cache PlatformIO
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: ~/.platformio
  key: ${{ runner.os }}-platformio
@@ -59,9 +59,9 @@ jobs:
  cp -r hardware ~/artifacts/firmware
 
  - name: Store Artifacts
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
- name: firmware
+ name: temp-${{ matrix.target }}
  path: |
  ~/artifacts/**/*.bin
  ~/artifacts/**/*.json
@@ -72,20 +72,20 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  fetch-depth: 0
 
  - name: Set up Python
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: '3.10'
 
  - name: Get firmware artifacts
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
  with:
- name: firmware
  path: dist
+ merge-multiple: true
 
  - name: Build flasher "binary" with shiv
  run: |
@@ -94,7 +94,7 @@ jobs:
  shiv -c flash -o ../dist/firmware/flasher.pyz pyserial .
 
  - name: Update firmware artifact
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: firmware
  path: dist/**/*