Skip to content

Commit ea5708e

Browse files
authored
Merge branch 'master' into adjust-wait-post-repl-restart
2 parents df7fba3 + 48cb9ab commit ea5708e

File tree

478 files changed

+9790
-2800
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

478 files changed

+9790
-2800
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @rashiq @meiji163 @timvaillancourt

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
version: 2
3+
updates:
4+
- package-ecosystem: github-actions
5+
directory: "/"
6+
schedule:
7+
interval: daily

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ on: [pull_request]
55
jobs:
66
build:
77

8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v4
1212

1313
- name: Set up Go
14-
uses: actions/setup-go@v1
14+
uses: actions/setup-go@v5
1515
with:
16-
go-version: 1.17
16+
go-version-file: go.mod
1717

1818
- name: Build
1919
run: script/cibuild
2020

2121
- name: Upload gh-ost binary artifact
22-
uses: actions/upload-artifact@v1
22+
uses: actions/upload-artifact@v4
2323
with:
2424
name: gh-ost
2525
path: bin/gh-ost

.github/workflows/codeql.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@ name: "CodeQL analysis"
22

33
on:
44
push:
5+
branches: [ master ]
56
pull_request:
7+
branches: [ master ]
68
schedule:
7-
- cron: '0 0 * * 0'
9+
- cron: '25 22 * * 6'
810

911
jobs:
1012
codeql:
13+
permissions:
14+
actions: read
15+
contents: read
16+
security-events: write
1117

1218
strategy:
1319
fail-fast: false
@@ -16,10 +22,10 @@ jobs:
1622

1723
steps:
1824
- name: Checkout repository
19-
uses: actions/checkout@v2
25+
uses: actions/checkout@v4
2026

2127
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@v2
28+
uses: github/codeql-action/init@v3
2329

2430
- name: Perform CodeQL Analysis
25-
uses: github/codeql-action/analyze@v2
31+
uses: github/codeql-action/analyze@v3

.github/workflows/golangci-lint.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
name: lint
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/setup-go@v3
16+
- uses: actions/checkout@v4
17+
- uses: actions/setup-go@v5
1718
with:
18-
go-version: 1.17
19-
- uses: actions/checkout@v3
19+
go-version-file: go.mod
2020
- name: golangci-lint
21-
uses: golangci/golangci-lint-action@v3
21+
uses: golangci/golangci-lint-action@v6
2222
with:
23-
version: v1.46.2
23+
version: v1.54.2

.github/workflows/replica-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
version: [mysql-5.7.25,mysql-8.0.16,PerconaServer-8.0.21]
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515

1616
- name: Set up Go
17-
uses: actions/setup-go@v1
17+
uses: actions/setup-go@v5
1818
with:
19-
go-version: 1.17
19+
go-version-file: go.mod
2020

2121
- name: migration tests
2222
env:

Dockerfile.packaging

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
FROM golang:1.17-stretch
2-
3-
# Update stretch repositories
4-
RUN sed -i -e 's/deb.debian.org/archive.debian.org/g' \
5-
-e 's|security.debian.org|archive.debian.org/|g' \
6-
-e '/stretch-updates/d' /etc/apt/sources.list
1+
FROM golang:1.22-bullseye
72

83
RUN apt-get update
94
RUN apt-get install -y ruby ruby-dev rubygems build-essential
10-
RUN gem install --no-ri --no-rdoc fpm
5+
RUN gem install fpm
116
ENV GOPATH=/tmp/go
127

138
RUN apt-get install -y curl

Dockerfile.test

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
FROM golang:1.17-stretch
1+
FROM golang:1.22-bullseye
22
LABEL maintainer="[email protected]"
33

4-
#Update stretch repositories
5-
RUN sed -i -e 's/deb.debian.org/archive.debian.org/g' \
6-
-e 's|security.debian.org|archive.debian.org/|g' \
7-
-e '/stretch-updates/d' /etc/apt/sources.list
8-
94
RUN apt-get update
105
RUN apt-get install -y lsb-release
116
RUN rm -rf /var/lib/apt/lists/*

RELEASE_VERSION

Lines changed: 0 additions & 1 deletion
This file was deleted.

build.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,18 @@ main() {
5252
RELEASE_VERSION=$(git describe --abbrev=0 --tags | tr -d 'v')
5353
fi
5454
if [ -z "${RELEASE_VERSION}" ] ; then
55-
RELEASE_VERSION=$(cat RELEASE_VERSION)
55+
echo "RELEASE_VERSION must be set"
56+
exit 1
5657
fi
5758

59+
if [ -z "${GIT_COMMIT}" ]; then
60+
GIT_COMMIT=$(git rev-parse HEAD)
61+
fi
5862

5963
buildpath=/tmp/gh-ost-release
6064
target=gh-ost
6165
timestamp=$(date "+%Y%m%d%H%M%S")
62-
ldflags="-X main.AppVersion=${RELEASE_VERSION}"
66+
ldflags="-X main.AppVersion=${RELEASE_VERSION} -X main.GitCommit=${GIT_COMMIT}"
6367

6468
mkdir -p ${buildpath}
6569
rm -rf ${buildpath:?}/*

0 commit comments

Comments
 (0)