Skip to content

Commit

Permalink
CI: Update actions to avoid warnings and Flatpak build error.
Browse files Browse the repository at this point in the history
  • Loading branch information
ruevs committed Jun 26, 2024
1 parent 40a1fdc commit af8dda8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
permissions:
actions: write
steps:
- uses: styfle/cancel-workflow-action@0.9.1
- uses: styfle/cancel-workflow-action
with:
access_token: ${{ github.token }}

Expand All @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
name: Test Ubuntu
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Dependencies
run: .github/scripts/install-ubuntu.sh
- name: Build & Test
Expand All @@ -35,7 +35,7 @@ jobs:
runs-on: windows-2019
name: Test Windows
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Dependencies
run: .github/scripts/install-windows.sh
shell: bash
Expand All @@ -48,7 +48,7 @@ jobs:
runs-on: macos-latest
name: Test macOS
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Dependencies
run: .github/scripts/install-macos.sh ci
- name: Build & Test
Expand All @@ -59,15 +59,15 @@ jobs:
name: Build Release Windows
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Dependencies
run: .github/scripts/install-windows.sh
shell: bash
- name: Build & Test
run: .github/scripts/build-windows.sh release
shell: bash
- name: Upload artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: windows
path: build/bin/RelWithDebInfo/solvespace.exe
Expand All @@ -77,15 +77,15 @@ jobs:
name: Build Release Windows (OpenMP)
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Dependencies
run: .github/scripts/install-windows.sh
shell: bash
- name: Build & Test
run: .github/scripts/build-windows.sh release openmp
shell: bash
- name: Upload artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: windows-openmp
path: build/bin/RelWithDebInfo/solvespace-openmp.exe
Expand All @@ -95,7 +95,7 @@ jobs:
name: Build Release macOS
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Dependencies
run: .github/scripts/install-macos.sh ci
- name: Build & Test
Expand All @@ -109,7 +109,7 @@ jobs:
MACOS_APPSTORE_USERNAME: ${{ secrets.MACOS_APPSTORE_USERNAME }}
MACOS_DEVELOPER_ID: ${{ secrets.MACOS_DEVELOPER_ID }}
- name: Upload artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: macos
path: build/bin/SolveSpace.dmg
Expand All @@ -119,7 +119,7 @@ jobs:
# name: Deploy AMD64 Snap
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2
# - uses: actions/checkout@v4
# - name: Fetch Tags
# run: git fetch --force --tags
# - name: Set Up Source
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download All Workflow Artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
- name: Get Release Upload URL
id: get_upload_url
env:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
name: Test Ubuntu
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Dependencies
run: .github/scripts/install-ubuntu.sh
- name: Build & Test
Expand All @@ -25,7 +25,7 @@ jobs:
runs-on: windows-2019
name: Test Windows
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Dependencies
run: .github/scripts/install-windows.sh
shell: bash
Expand All @@ -37,7 +37,7 @@ jobs:
runs-on: macos-latest
name: Test macOS
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Dependencies
run: .github/scripts/install-macos.sh ci
- name: Build & Test
Expand All @@ -54,7 +54,7 @@ jobs:
with:
submodules: true
fetch-depth: 0
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with:
bundle: "solvespace.flatpak"
manifest-path: "pkg/flatpak/com.solvespace.SolveSpace.json"
Expand Down

0 comments on commit af8dda8

Please sign in to comment.