Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[publish angle win] Update angle version and add Python 3.12 to matrix for angle and update Github Actions for related jobs #99

Merged
merged 4 commits into from
Dec 8, 2023
Merged

[publish angle win] Update angle version and add Python 3.12 to matrix for angle and update Github Actions for related jobs #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e15642
Add Python 3.12 to matrix for angle and update Github Actions for rel…
misl6 Dec 6, 2023
3849e52
Seems to fail for no reason. Test windows-latest
misl6 Dec 7, 2023
b5eba0c
Update tracked branch for angle and update version
misl6 Dec 7, 2023
af13d66
New download-artifact version works differently
misl6 Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions .github/workflows/windows_angle_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ env:

jobs:
prepare_angle:
runs-on: windows-2019
runs-on: windows-latest
env:
DEPOT_TOOLS_WIN_TOOLCHAIN: 0
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Get dependecies
run: |
. .\ci\windows_ci.ps1
Expand All @@ -33,7 +33,7 @@ jobs:
run: |
. .\ci\windows_ci.ps1
Build-angle
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v3
with:
name: angle_dlls
path: angle_dlls
Expand All @@ -45,30 +45,31 @@ jobs:
strategy:
fail-fast: false
matrix:
python: [ '3.7', '3.8', '3.9', '3.10', '3.11' ]
python: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12' ]
arch: ['x64', 'x86']
env:
PACKAGE_ARCH: ${{ matrix.arch }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
architecture: ${{ matrix.arch }}
- name: Prepare Environment
run: |
. .\ci\windows_ci.ps1
Prepre-env
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v3
with:
name: angle_dlls
path: angle_dlls
- name: Build package
run: |
. .\ci\windows_ci.ps1
Create-Packages
- name: Upload wheels as artifact
uses: actions/upload-artifact@master
uses: actions/upload-artifact@v3
with:
name: angle_wheels
path: dist
Expand Down
2 changes: 1 addition & 1 deletion ci/windows_ci.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function Test-kivy() {
function Get-angle-deps() {
Invoke-WebRequest -Uri "https://storage.googleapis.com/chrome-infra/depot_tools.zip" -OutFile depot_tools.zip
7z x depot_tools.zip -odepot_tools
git clone -b "chromium/4758" --single-branch https://github.com/google/angle.git angle_src
git clone -b "chromium/6045" --single-branch https://github.com/google/angle.git angle_src
}

function Build-angle() {
Expand Down
2 changes: 1 addition & 1 deletion win/angle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import, print_function
from .common import *

__version__ = '0.3.3'
__version__ = '0.4.0'


def get_angle(cache, build_path, arch, package, output, download_only=False):
Expand Down