-
Notifications
You must be signed in to change notification settings - Fork 560
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.
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 soon to be deprecated runners to newer versions #596
Open
Niam5
wants to merge
1
commit into
cmangos:master
Choose a base branch
from
Eluna-Ports:CI-Fix
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,15 +7,13 @@ env: | |
| BUILD_TYPE: Release | ||
| REPO_DIR : ${{github.workspace}} | ||
| BUILD_DIR: ${{github.workspace}}/bin/builddir | ||
| BOOST_VERSION: "1.83.0" | ||
| BOOST_PLATFORM_VERSION: "13" | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: macos-13 | ||
| runs-on: macos-14 | ||
| permissions: | ||
| contents: read | ||
|
|
||
|
|
@@ -27,29 +25,15 @@ jobs: | |
|
|
||
| - name: Install Dependencies | ||
| run: | | ||
| brew install mysql-client | ||
| brew install mysql-client@8.4 | ||
| brew install openssl | ||
| brew install [email protected] | ||
| echo "OPENSSL_ROOT_DIR=$(brew --prefix --installed openssl)" >> $GITHUB_ENV | ||
|
|
||
| - name: Install Boost | ||
| uses: MarkusJx/[email protected] | ||
| id: install-boost | ||
| with: | ||
| # REQUIRED: Specify the required boost version | ||
| # A list of supported versions can be found here: | ||
| # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json | ||
| boost_version: ${{env.BOOST_VERSION}} | ||
| # OPTIONAL: Specify a platform version | ||
| platform_version: ${{env.BOOST_PLATFORM_VERSION}} | ||
| # OPTIONAL: Specify a toolset | ||
| toolset: clang | ||
| # NOTE: If a boost version matching all requirements cannot be found, | ||
| # this build step will fail | ||
|
|
||
| - name: Configure | ||
| env: | ||
| BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} | ||
| run: cmake -B ${{env.BUILD_DIR}} -S ${{env.REPO_DIR}} -DBoost_ARCHITECTURE=-x64 | ||
| BOOST_ROOT: /opt/homebrew/opt/boost@1.85 | ||
| run: cmake -B ${{env.BUILD_DIR}} -S ${{env.REPO_DIR}} -DBoost_ARCHITECTURE=-arm64 | ||
|
|
||
| - name: Build | ||
| env: | ||
|
|
@@ -60,7 +44,7 @@ jobs: | |
| permissions: | ||
| contents: none | ||
| name: Send Notification to Discord on Failure | ||
| runs-on: ubuntu-20.04 | ||
| runs-on: ubuntu-latest | ||
| needs: # make sure the notification is sent AFTER the jobs you want included have completed | ||
| - build | ||
| if: failure() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,8 @@ if( UNIX ) | |
| /usr/local/bin/ | ||
| /usr/bin/ | ||
| /usr/local/opt/mysql/bin/ | ||
| /opt/homebrew/opt/mysql-client/bin | ||
| /opt/homebrew/opt/[email protected]/bin | ||
| /opt/mysql/mysql/bin/ | ||
| ) | ||
|
|
||
|
|
@@ -77,6 +79,10 @@ find_path(MYSQL_INCLUDE_DIR | |
| /usr/local/opt/mysql/include | ||
| /usr/local/opt/mysql-client/include | ||
| /usr/local/opt/mysql-client/include/mysql | ||
| /opt/homebrew/opt/mysql-client | ||
| /opt/homebrew/opt/mysql-client/include | ||
| /opt/homebrew/opt/[email protected] | ||
| /opt/homebrew/opt/[email protected]/include | ||
| /opt/mysql/mysql/include | ||
| /opt/mysql/mysql/include/mysql | ||
| "C:/Program Files/MySQL/include" | ||
|
|
@@ -107,6 +113,10 @@ foreach(LIB ${MYSQL_ADD_LIBRARIES}) | |
| /usr/local/mysql/lib/mysql | ||
| /usr/local/opt/mysql/lib | ||
| /usr/local/opt/mysql-client/lib | ||
| /opt/homebrew/opt/mysql-client | ||
| /opt/homebrew/opt/mysql-client/lib | ||
| /opt/homebrew/opt/[email protected] | ||
| /opt/homebrew/opt/[email protected]/lib | ||
| /opt/mysql/mysql/lib | ||
| /opt/mysql/mysql/lib/mysql | ||
| DOC "Specify the location of the mysql library here." | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I updated the macOS runners a while ago after pushing changes and noticing the macOS builds were failing (see cmangos/mangos-tbc@9de293e and the merges this week to the other cores), so macOS builds should be fine again for now.
There's certainly something to say for going to macos-14 and arm64 builds, but also for using a somewhat older system (with typically older toolchain). The first tests that "newest" stuff can build the core, the second that it also still works with "older" stuff. I think we tend to go with older because newer is tested more by devs/users.
I'm going to guess the boost and MySQL changes are related to the move to arm64 macOS builds?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Answer to this would be preferable before merging. Otherwise no comments from me @Niam5
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I commented below but it seems GH didn't send it out. The reason I set it to 14 is 13 is the last Intel runner as detailed here https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources so the choice is to either change now and fixup the runner for the direction GH is headed or just kick the can down the road and when 13 goes away do it then. Figured it was easier to fix it now and follow the direction the runners are going then just postponing it