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

upgrade Qt to 6.8.1 to sync with github workflow #172

Merged
merged 4 commits into from
Jan 12, 2025
+4 −4
Merged

upgrade Qt to 6.8.1 to sync with github workflow #172

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6541377
upgrade Qt to 6.8.1 to sync with github workflow, and qt-6.6.3 is no …
Jan 11, 2025
4944bf9
switch to the latest macos
Jan 11, 2025
96c1dbe
CI with macos-13,14,15
Jan 11, 2025
7938793
Use only one mac os version
yungyuc Jan 12, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/shunit2_runner.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, macos-12]
os: [ubuntu-20.04, macos-latest]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use an explicit version, not -latest.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @yungyuc

This is also used in other workflows of this repo. Although they are disabled, do you want to change them to use explicit version as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is explicitly specified to use "macos-15" now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now, the CI is running against macos-13, macOS-14, macos-15. 13 and 14 are in alignment with modmesh workflow, and 15 is the latest macos and in alignment with my dev environment.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like it to be with macos-15 only. The simple unit tests cannot cover all build scenarios and it's better to keep it simple at the moment.

fail-fast: false
steps:
- name: Checkout repository
Expand Down
6 changes: 3 additions & 3 deletions scripts/build.d/qt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ SKIPEXTRACT=${SKIPEXTRACT:-0}

if [ -z "${SYNCGIT}" ]; then
pkgname=qt
pkgmajorver=${MAJOR_VER:-6.6}
pkgsubver=${SUB_VER:-3}
pkgmajorver=${MAJOR_VER:-6.8}
pkgsubver=${SUB_VER:-1}
pkgver=$pkgmajorver.$pkgsubver
pkgmd5=${MD5:-0e2c9dd87cbc6768da2bfc7f776c272f}
pkgmd5=${MD5:--4068b07ca6366bcb9ba56508bbbf20e6}
pkgfull=$pkgname-$pkgver
pkgfoler=qt-everywhere-src-$pkgver

Expand Down