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

Update workflows to use the lastest Ubuntu runners. #2630

Merged
merged 5 commits into from
Dec 23, 2024
Merged

Update workflows to use the lastest Ubuntu runners. #2630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e024c9d
Update workflows to use the lastest Ubuntu runners.
domchen Dec 20, 2024
7b0a948
update tgfx
Hparty Dec 20, 2024
a5ccaf1
Update workflows to fix some cache failure warnings.
domchen Dec 20, 2024
980f66c
fix crash while SequenceImageQueue create failed
Hparty Dec 20, 2024
7b51645
update version.json
Hparty Dec 23, 2024
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
43 changes: 4 additions & 39 deletions .github/workflows/autotest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,6 @@ jobs:
fetch-depth: 0
lfs: true

- name: Get Environment Cache
id: environment-cache
uses: actions/cache/restore@v4
with:
path: |
/usr/local/Cellar/ninja
/usr/local/Cellar/icu4c
/usr/local/bin/ninja
/usr/local/Cellar/yasm
/usr/local/bin/yasm
/usr/local/Cellar/gcovr
/usr/local/bin/gcovr
/usr/local/Cellar/python-lxml
/usr/local/Cellar/python-markupsafe
/usr/local/lib/python3.12/site-packages/gcovr
/usr/local/lib/python3.12/site-packages/lxml
/usr/local/lib/python3.12/site-packages/markupsafe
key: libpag-environment-autotest-202311129
restore-keys: libpag-environment-autotest-

- name: Get Third-Party Cache
id: third-party-cache
uses: actions/cache/restore@v4
Expand All @@ -47,6 +27,10 @@ jobs:
key: third-party-autotest-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }}
restore-keys: third-party-autotest-

- uses: tecolicom/actions-use-homebrew-tools@v1
with:
tools: ninja yasm gcovr

- name: Run depsync
run: |
npm install depsync -g
Expand Down Expand Up @@ -77,25 +61,6 @@ jobs:
file: result/coverage.xml
version: 'v0.7.3'

- name: Save Environment Cache
if: ${{ (github.event_name == 'push') && (steps.environment-cache.outputs.cache-hit != 'true') }}
uses: actions/cache/save@v4
with:
path: |
/usr/local/Cellar/ninja
/usr/local/Cellar/icu4c
/usr/local/bin/ninja
/usr/local/Cellar/yasm
/usr/local/bin/yasm
/usr/local/Cellar/gcovr
/usr/local/bin/gcovr
/usr/local/Cellar/python-lxml
/usr/local/Cellar/python-markupsafe
/usr/local/lib/python3.12/site-packages/gcovr
/usr/local/lib/python3.12/site-packages/lxml
/usr/local/lib/python3.12/site-packages/markupsafe
key: libpag-environment-autotest-202311129

- name: Save Third-Party Cache
if: ${{ (github.event_name == 'push') && (steps.third-party-cache.outputs.cache-hit != 'true') }}
uses: actions/cache/save@v4
Expand Down
57 changes: 17 additions & 40 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,6 @@ jobs:
with:
lfs: true

- name: Get Environment Cache
id: environment-cache
uses: actions/cache/restore@v4
with:
path: |
/usr/local/Cellar/ninja
/usr/local/Cellar/icu4c
/usr/local/bin/ninja
/usr/local/Cellar/yasm
/usr/local/bin/yasm
key: libpag-environment-ios-20231129
restore-keys: libpag-environment-ios-

- name: Get Third-Party Cache
id: third-party-cache
uses: actions/cache/restore@v4
Expand All @@ -37,6 +24,10 @@ jobs:
key: third-party-ios-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}
restore-keys: third-party-ios-

- uses: tecolicom/actions-use-homebrew-tools@v1
with:
tools: ninja yasm

- name: Install Build Tools
run: |
chmod +x install_tools.sh
Expand All @@ -56,18 +47,6 @@ jobs:
node gen_ios
xcodebuild -workspace PAGViewer.xcworkspace -scheme PAGViewer -configuration Release -sdk iphoneos -arch arm64 CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO

- name: Save Environment Cache
if: ${{ (github.event_name == 'push') && (steps.environment-cache.outputs.cache-hit != 'true') }}
uses: actions/cache/save@v4
with:
path: |
/usr/local/Cellar/ninja
/usr/local/Cellar/icu4c
/usr/local/bin/ninja
/usr/local/Cellar/yasm
/usr/local/bin/yasm
key: libpag-environment-ios-20231129

- name: Save Third-Party Cache
if: ${{ (github.event_name == 'push') && (steps.third-party-cache.outputs.cache-hit != 'true') }}
uses: actions/cache/save@v4
Expand All @@ -78,7 +57,7 @@ jobs:

- name: Job Failed
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ios_build
path: ios
Expand Down Expand Up @@ -107,13 +86,6 @@ jobs:

- uses: seanmiddleditch/gha-setup-ninja@master

- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r19c
link-to-sdk: true
local-cache: true

- uses: actions/setup-java@v4
with:
distribution: 'temurin'
Expand All @@ -136,7 +108,7 @@ jobs:

- name: Job Failed
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: android_build
path: android
Expand Down Expand Up @@ -216,7 +188,7 @@ jobs:

- name: Job Failed
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: web_build
path: |
Expand Down Expand Up @@ -262,7 +234,7 @@ jobs:

- name: Job Failed
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: win_build
path: out
Expand Down Expand Up @@ -292,6 +264,11 @@ jobs:
depsync
shell: bash

- uses: awalsh128/cache-apt-pkgs-action@latest
with:
packages: libx11-dev
version: 1.0

- name: Build Linux
run: |
mkdir -p third_party/tgfx/out/cache
Expand All @@ -310,7 +287,7 @@ jobs:

- name: Job Failed
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux_build
path: linux
Expand Down Expand Up @@ -341,11 +318,11 @@ jobs:
shell: bash

- name: Install Qt
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v4
with:
host: 'linux'
target: 'desktop'
version: '6.6.1'
version: '6.8.1'
dir: '${{github.workspace}}/qt/'
install-deps: 'true'
cache: 'true'
Expand All @@ -366,7 +343,7 @@ jobs:

- name: Job Failed
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: qt_build
path: out
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
{
"url": "${PAG_GROUP}/tgfx.git",
"commit": "b062b9a779e481e99f0e1da1f0951f0f5a9f431f",
"commit": "451b9fa3f3c4c0b42c7a3cc3f17b5c16ec056af3",
"dir": "third_party/tgfx"
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/base/Matrix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ void Matrix::setAll(float scaleX, float skewX, float transX, float skewY, float
}

void Matrix::setAffine(float a, float b, float c, float d, float tx, float ty) {
ToTGFX(this)->setAffine(a, b, c, d, tx, ty);
ToTGFX(this)->setAll(a, c, tx, b, d, ty);
}

void Matrix::setTranslate(float dx, float dy) {
Expand Down
4 changes: 3 additions & 1 deletion src/rendering/caches/RenderCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ void RenderCache::preparePreComposeLayer(PreComposeLayer* layer) {
return;
}
auto queue = makeSequenceImageQueue(info);
queue->prepareNextImage();
if (queue) {
queue->prepareNextImage();
}
}

void RenderCache::prepareImageLayer(PAGImageLayer* pagLayer) {
Expand Down
2 changes: 1 addition & 1 deletion src/rendering/renderers/ShapeRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ void RenderElements(const std::vector<ShapeElement*>& list, const tgfx::Matrix&
}
}

std::unique_ptr<tgfx::PathEffect> CreateDashEffect(const std::vector<float>& dashes,
std::shared_ptr<tgfx::PathEffect> CreateDashEffect(const std::vector<float>& dashes,
float dashOffset) {
auto dashCount = dashes.size();
auto size = static_cast<int>(dashCount);
Expand Down
Loading
Loading