Skip to content

Commit 69d72ba

Browse files
RainbowDashyrashiqmeiji163testwilltimvaillancourt
authored
chore: merge upstream (#33)
* Add `focal` build * upgrade codeQL action to v2 * Pin docker image to stretch (github#1324) * pin stretch image * update stretch repo * Update Dockerfile.test * parse binlog timestamp in UTC (github#1322) * upgrade standard library deps (github#1332) * fix: typo (github#1331) Co-authored-by: Tim Vaillancourt <[email protected]> * Remove stale RELEASE_VERSION file (github#1349) Signed-off-by: Tim Vaillancourt <[email protected]> * Force index in unique key range queries (github#1237) * WIP * Pass entire sql.UniqueKey * newline for limit * Rename var --------- Co-authored-by: meiji163 <[email protected]> * Include git commit in version (github#1347) * Include git commit in version Signed-off-by: Tim Vaillancourt <[email protected]> * Make --version output change less-breaking --------- Signed-off-by: Tim Vaillancourt <[email protected]> * Fix tokens in inspector logging (github#1226) * Cleanup whitespace and comments in SQL query text (github#1246) * Cleanup whitespace in SQL query text * cleanup * Add indent * Update unit tests * Update unit tests, pt 2 * Fix tweaks * Fix merge conflict resolution Signed-off-by: Tim Vaillancourt <[email protected]> --------- Signed-off-by: Tim Vaillancourt <[email protected]> * Fix `--version` output (github#1352) * Fix `--version` output Signed-off-by: Tim Vaillancourt <[email protected]> * Always fallback version/commit if undef Signed-off-by: Tim Vaillancourt <[email protected]> --------- Signed-off-by: Tim Vaillancourt <[email protected]> * Update to `go1.21` (github#1351) * go1.21 + bullseye Signed-off-by: Tim Vaillancourt <[email protected]> * go1.21 + bullseye pt 2 Signed-off-by: Tim Vaillancourt <[email protected]> * checkout before setup-go Signed-off-by: Tim Vaillancourt <[email protected]> * go fmt Signed-off-by: Tim Vaillancourt <[email protected]> * Use golangci-lint 1.54.2 to support go1.21 Signed-off-by: Tim Vaillancourt <[email protected]> * stop using io/ioutil to make linter happy Signed-off-by: Tim Vaillancourt <[email protected]> * Fix typo Signed-off-by: Tim Vaillancourt <[email protected]> * Lint Signed-off-by: Tim Vaillancourt <[email protected]> * revert replica-tests CI to ubuntu 20 due to linker errors Signed-off-by: Tim Vaillancourt <[email protected]> * Update ensure-go-installed * use `ubuntu-latest` for `ci` job Signed-off-by: Tim Vaillancourt <[email protected]> * stretch -> bullseye Signed-off-by: Tim Vaillancourt <[email protected]> --------- Signed-off-by: Tim Vaillancourt <[email protected]> Signed-off-by: Tim Vaillancourt <[email protected]> * Replace deprecated `github.com/satori/go.uuid` lib (github#1354) Signed-off-by: Tim Vaillancourt <[email protected]> * Add `CODEOWNERS` file to auto-request reviews (github#1350) Signed-off-by: Tim Vaillancourt <[email protected]> * go mod tidy * update test * fix lint --------- Signed-off-by: Tim Vaillancourt <[email protected]> Signed-off-by: Tim Vaillancourt <[email protected]> Co-authored-by: Rashiq <[email protected]> Co-authored-by: meiji163 <[email protected]> Co-authored-by: guangwu <[email protected]> Co-authored-by: Tim Vaillancourt <[email protected]>
1 parent b37a652 commit 69d72ba

File tree

326 files changed

+49086
-16014
lines changed

Some content is hidden

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

326 files changed

+49086
-16014
lines changed

‎.github/CODEOWNERS‎

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

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ 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@v4
1515
with:
16-
go-version: 1.17
16+
go-version-file: go.mod
1717

1818
- name: Build
1919
run: script/cibuild

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@v2
2020

2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@v1
22+
uses: github/codeql-action/init@v2
2323

2424
- name: Perform CodeQL Analysis
25-
uses: github/codeql-action/analyze@v1
25+
uses: github/codeql-action/analyze@v2

‎.github/workflows/golangci-lint.yml‎

Lines changed: 4 additions & 4 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@v4
1718
with:
18-
go-version: 1.17
19-
- uses: actions/checkout@v3
19+
go-version-file: go.mod
2020
- name: golangci-lint
2121
uses: golangci/golangci-lint-action@v3
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@v4
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM golang:1.17
1+
FROM golang:1.21-bullseye
22

33
RUN apt-get update
44
RUN apt-get install -y ruby ruby-dev rubygems build-essential
5-
RUN gem install --no-ri --no-rdoc fpm
5+
RUN gem install fpm
66
ENV GOPATH=/tmp/go
77

88
RUN apt-get install -y curl

‎Dockerfile.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17
1+
FROM golang:1.21-bullseye
22
LABEL maintainer="[email protected]"
33

44
RUN apt-get update

‎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:?}/*

‎doc/azure.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ gh-ost \
1717
--master-user="master-user-name" \
1818
--master-password="master-password" \
1919
--assume-rbr \
20-
[-- other paramters you need]
20+
[-- other parameters you need]
2121
```
2222

2323

2424
[new_issue]: https://github.com/github/gh-ost/issues/new
2525
[assume_rbr_docs]: https://github.com/github/gh-ost/blob/master/doc/command-line-flags.md#assume-rbr
26-
[migrate_test_on_replica_docs]: https://github.com/github/gh-ost/blob/master/doc/cheatsheet.md#c-migratetest-on-replica
26+
[migrate_test_on_replica_docs]: https://github.com/github/gh-ost/blob/master/doc/cheatsheet.md#c-migratetest-on-replica

0 commit comments

Comments
 (0)