Skip to content

Commit

Permalink
Let’s try buildiing with both old and newer stacks
Browse files Browse the repository at this point in the history
  • Loading branch information
Lord-Kamina committed Jun 28, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 20e9a60 commit e5544df
Showing 2 changed files with 15 additions and 5 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@ on:
ref:
description: "Enter a tag or commit to package"
default: ""

jobs:
windows_package:
runs-on: windows-2022
@@ -25,7 +24,11 @@ jobs:
matrix:
arch: [x64, x86]
python: ["3.10"]
gvsbuild-stack: ["latest"]
libtorrent: [2.0.8, 1.2.19]
include:
- python: 3.7
gvsbuild-stack: older

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -54,7 +57,7 @@ jobs:
- name: Install GTK
run: |
$WebClient = New-Object System.Net.WebClient
$WebClient.DownloadFile("https://github.com/${{ github.repository_owner }}/gvsbuild-release/releases/download/latest/gvsbuild-py${{ matrix.python }}-vs17-${{ matrix.arch }}.zip","C:\GTK.zip")
$WebClient.DownloadFile("https://github.com/${{ github.repository_owner }}/gvsbuild-release/releases/download/${{ matrix.gvsbuild-stack }}/gvsbuild-py${{ matrix.python }}-vs17-${{ matrix.arch }}.zip","C:\GTK.zip")
7z x C:\GTK.zip -oc:\GTK
echo "C:\GTK\release\lib" | Out-File -FilePath $env:GITHUB_PATH -Append
echo "C:\GTK\release\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
13 changes: 10 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -12,11 +12,14 @@ on:
default: "0"
jobs:
test-linux:
runs-on: ubuntu-24.04
strategy:
matrix:
python-version: ["3.9", "3.10"]

os: ["ubuntu-24.04"]
include:
- os: ubuntu-22.04
python-version: 3.7
runs-on: ${{ matrix.os }}
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v4
@@ -76,6 +79,10 @@ jobs:
strategy:
matrix:
python-version: ["3.9", "3.10"]
gvsbuild-stack: ["latest"]
include:
- python-version: 3.7
gvsbuild-stack: older

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -93,7 +100,7 @@ jobs:
- name: Install GTK
run: |
$WebClient = New-Object System.Net.WebClient
$WebClient.DownloadFile("https://github.com/${{ github.repository_owner }}/gvsbuild-release/releases/download/latest/gvsbuild-py${{ matrix.python-version }}-vs17-x64.zip","C:\GTK.zip")
$WebClient.DownloadFile("https://github.com/${{ github.repository_owner }}/gvsbuild-release/releases/download/${{ matrix.gvsbuild-stack }}/gvsbuild-py${{ matrix.python-version }}-vs17-x64.zip","C:\GTK.zip")
7z x C:\GTK.zip -oc:\GTK
echo "C:\GTK\release\lib" | Out-File -FilePath $env:GITHUB_PATH -Append
echo "C:\GTK\release\bin" | Out-File -FilePath $env:GITHUB_PATH -Append

0 comments on commit e5544df

Please sign in to comment.