Skip to content

Commit

Permalink
[GH Actions] Updated steps to non-deprecated versions and separated w…
Browse files Browse the repository at this point in the history
…indows sign-installer job (#1409)

- Updated steps to non-deprecated versions
- Moved sign-installer job for windows to its own job, so we don't need to re-run everything if that one fails
- Increased timeout for sign-installer job from 100s to 300s
  • Loading branch information
FlorianReimold authored Mar 1, 2024
1 parent dee0744 commit d356da1
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@ jobs:
working-directory: ${{ runner.workspace }}/_build

- name: Upload DMG
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macos-dmg
path: ${{ runner.workspace }}/_build/_deploy/*.dmg

- name: Upload Python Wheel
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macos-python-wheel
path: ${{ runner.workspace }}/_build/_deploy/*.whl
6 changes: 3 additions & 3 deletions .github/workflows/build-ubuntu-20.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,13 @@ jobs:
working-directory: ${{ runner.workspace }}/_build

- name: Upload Debian
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ubuntu-debian
path: ${{ runner.workspace }}/_build/_deploy/*.deb

- name: Upload Python Wheel
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ubuntu-python-wheel
path: ${{ runner.workspace }}/_build/_deploy/*.whl
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
# https://github.com/actions/upload-artifact
- name: Upload the whole directory
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ecal-dir
path: ${{ runner.workspace }}/ecal.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-ubuntu-22.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,13 @@ jobs:
working-directory: ${{ runner.workspace }}/_build

- name: Upload Debian
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ubuntu-debian
path: ${{ runner.workspace }}/_build/_deploy/*.deb

- name: Upload Python Wheel
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ubuntu-python-wheel
path: ${{ runner.workspace }}/_build/_deploy/*.whl
23 changes: 18 additions & 5 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -288,19 +288,32 @@ jobs:
debug: false

- name: Upload Windows setup
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows-setup
path: ${{ runner.workspace }}/_build/complete/_deploy/*.exe

- name: Upload Python Wheels
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows-python-wheels
path: ${{ runner.workspace }}/_build/complete/_deploy/*.whl

# --------------------------------------------------------------------------------------------------

sign-windows-installer:
runs-on: windows-2019
needs: build-windows

steps:

# Download the installer from the previous job
- name: Download Windows setup
uses: actions/download-artifact@v4
with:
name: windows-setup
path: ${{ runner.workspace }}/_build/complete/_deploy

- name: Sign the installer on Eclipse CI
if: env.IS_JENKINS_SIGNING_ALLOWED == 'true' && env.JENKINS_USERNAME != '' && env.JENKINS_API_TOKEN != '' && env.JENKINS_JOB_TOKEN != ''
run: |
Expand All @@ -313,8 +326,8 @@ jobs:
$JENKINS_CRUMB_URL = "$JENKINS_BASE_URL/crumbIssuer/api/json"
$JENKINS_JOB_URL = "$JENKINS_BASE_URL/job/$JENKINS_JOB"
$JENKINS_TRIGGER_URL = "$JENKINS_JOB_URL/buildWithParameters?token=$Env:JENKINS_JOB_TOKEN"
$WAIT_FOR_JENKINS_SEC = 5
$COUNTER_LIMIT = 20
$WAIT_FOR_JENKINS_SEC = 10
$COUNTER_LIMIT = 30
$RESPONSE_CODE = 0
$CRUMB_ID = ''
$CRUMB_FIELD = ''
Expand Down Expand Up @@ -470,7 +483,7 @@ jobs:

- name: Upload Windows setup signed on Eclipse CI
if: env.IS_DOWNLOAD_AVAILABLE == 'true'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows-setup-signed
path: ${{ runner.workspace }}/_build/complete/_deploy/${{ env.ASSET_NAME }}
2 changes: 1 addition & 1 deletion .github/workflows/ecal-fat-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
shell: bash

- name: Upload source
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ecal-fat-source
path: ${{ runner.workspace }}/cleaned/ecal-fat-source.tar.gz
2 changes: 1 addition & 1 deletion .github/workflows/pr-auto-approve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
echo "${{ steps.protected-files-changes.outputs.all_changed_files }}"
exit 1
- uses: hmarr/auto-approve-action@v3
- uses: hmarr/auto-approve-action@v4
if: steps.protected-files-changes.outputs.any_changed == 'false'
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/run-clang-tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# https://github.com/actions/download-artifact
- name: Download the built directory
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ecal-dir

Expand All @@ -46,7 +46,7 @@ jobs:
# https://github.com/actions/upload-artifact
# If make or clang-tidy is never called, artifact upload will fail (no log files) with just a warning.
- name: Archive logs as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: clang_tidy_log_${{ steps.suffix.outputs.timestamp }}
path: ~/work/ecal/_build/clang_tidy_log_*.txt
Expand Down

0 comments on commit d356da1

Please sign in to comment.