Skip to content

Commit

Permalink
Merge pull request #3317 from MishimaHaruna/ci-updates
Browse files Browse the repository at this point in the history
CI updates for deprecation warnings
  • Loading branch information
MishimaHaruna authored Aug 31, 2024
2 parents 50efda8 + 0a32256 commit 891195a
Show file tree
Hide file tree
Showing 16 changed files with 27 additions and 115 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
# gcc, clang-8, clang-9 removed for reduce number of jobs
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
CC: ${{ matrix.CC }}
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clang15_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [clang-15]
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }}
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
4 changes: 0 additions & 4 deletions .github/workflows/controller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ jobs:
needs: build
if: ${{ !failure() && !cancelled() }}
uses: ./.github/workflows/gccold2.yml
gccold3:
needs: build
if: ${{ !failure() && !cancelled() }}
uses: ./.github/workflows/gccold3.yml
gccsnapshot_test:
needs: build
if: ${{ !failure() && !cancelled() }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gcc_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [gcc]
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gccold1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: ["gcc-10", "gcc-9"]
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
CC: ${{ matrix.CC }}
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gccold2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: ["gcc-8", "gcc-7"]
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
CC: ${{ matrix.CC }}
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
84 changes: 0 additions & 84 deletions .github/workflows/gccold3.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/gccsnapshot_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [gcc]
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hwsapibot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
group: hwsapibot
cancel-in-progress: true
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: info
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos_latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ env:
MYSQL_USER: 'ragnarok'
MYSQL_PASSWORD: 'ragnarok'
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
MACOS_COMMON_PACKAGES: make zlib pcre mysql mysql-client mysql-connector-c
MACOS_COMMON_PACKAGES: make zlib pcre mysql mysql-client
SQLHOST: 'localhost'

jobs:
build:
runs-on: macos-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [clang]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos_m1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ env:
MYSQL_USER: 'ragnarok'
MYSQL_PASSWORD: 'ragnarok'
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
MACOS_COMMON_PACKAGES: make zlib pcre mysql mysql-client mysql-connector-c
MACOS_COMMON_PACKAGES: make zlib pcre mysql mysql-client
SQLHOST: 'localhost'

jobs:
build:
runs-on: macos-14
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [clang]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [gcc]
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }}
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [gcc]
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }}
PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
container:
image: debian:unstable
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
jobs:
build:
runs-on: windows-latest
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
CC: [msbuild]
Expand Down

0 comments on commit 891195a

Please sign in to comment.