Skip to content

Commit

Permalink
Merge pull request #14909 from manadart/3.0-into-3.0-dqlite
Browse files Browse the repository at this point in the history
Merge 3.0 into 3.0-dqlite
  • Loading branch information
manadart committed Nov 22, 2022
2 parents 6adff35 + 3558cad commit 27b23f3
Show file tree
Hide file tree
Showing 405 changed files with 8,192 additions and 3,455 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Find required go version
id: go-version
run: |
set -euxo pipefail
echo "::set-output name=version::$(grep '^go ' go.mod | awk '{print $2}')"
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: ${{ steps.go-version.outputs.version }}
id: go
go-version-file: 'go.mod'

- name: Build
run: |
Expand Down
17 changes: 5 additions & 12 deletions .github/workflows/client-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3

- name: Find required go version
id: go-version
run: |
set -euxo pipefail
echo "::set-output name=version::$(grep '^go ' go.mod | awk '{print $2}')"
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v3
uses: actions/setup-go@v3
with:
go-version: ${{ steps.go-version.outputs.version }}
id: go
go-version-file: 'go.mod'

- name: "Install Mongo Dependencies: ubuntu-latest"
if: (matrix.os == 'ubuntu-latest')
Expand All @@ -50,13 +43,13 @@ jobs:
- name: "Remove Mongo Dependencies: windows-latest"
if: (matrix.os == 'windows-latest')
uses: crazy-max/ghaction-chocolatey@b59ffdb6594d2e2c36d9e1174e15ac799dd0a8f1 # v1
uses: crazy-max/ghaction-chocolatey@90deb87d9fbf0bb2f022b91e3bf11b4441cddda5 # v1
with:
args: uninstall mongodb mongodb.install -y --all-versions

- name: "Install Mongo Dependencies: windows-latest"
if: (matrix.os == 'windows-latest')
uses: crazy-max/ghaction-chocolatey@b59ffdb6594d2e2c36d9e1174e15ac799dd0a8f1 # v1
uses: crazy-max/ghaction-chocolatey@90deb87d9fbf0bb2f022b91e3bf11b4441cddda5 # v1
with:
args: install mongodb.install --version=5.0.5 --allow-downgrade

Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/gen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Find required go version
id: go-version
run: |
set -euxo pipefail
echo "::set-output name=version::$(grep '^go ' go.mod | awk '{print $2}')"
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: ${{ steps.go-version.outputs.version }}
id: go
go-version-file: 'go.mod'

- name: go get dependencies
run: go get ./...
Expand Down
23 changes: 8 additions & 15 deletions .github/workflows/microk8s-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,20 @@ jobs:

steps:
- name: Checking out repo
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3

- name: Find required go version
id: go-version
run: |
set -euxo pipefail
echo "::set-output name=version::$(grep '^go ' go.mod | awk '{print $2}')"
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v3
uses: actions/setup-go@v3
with:
go-version: ${{ steps.go-version.outputs.version }}
id: go
go-version-file: 'go.mod'

- name: setup env
shell: bash
run: |
echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
- uses: balchua/microk8s-actions@98f481ca6bad1cdca5185008b9572a3102d46af3 # v0.2.2
- uses: balchua/microk8s-actions@v0.3.1
with:
channel: '${{ matrix.microk8s }}'
# enable now to give microk8s more time to settle down.
Expand Down Expand Up @@ -128,7 +121,7 @@ jobs:
if: ${{ failure() }}

- name: Upload debug log
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v2
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v2
with:
name: juju-debug-actions
path: juju-debug.log
Expand Down Expand Up @@ -156,7 +149,7 @@ jobs:
if: ${{ failure() }}

- name: Upload inspect tarball
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v2
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v2
with:
name: inspection-report-actions
path: ./inspection-report-${{ strategy.job-index }}.tar.gz
Expand All @@ -172,7 +165,7 @@ jobs:
if: ${{ failure() }}

- name: Upload kubectl describe
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v2
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v2
with:
name: kubectl-describe-actions
path: describe/*.describe
Expand All @@ -190,7 +183,7 @@ jobs:
if: ${{ failure() }}

- name: Upload kubeflow pod logs
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v2
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v2
with:
name: kubectl-stdout-actions
path: stdout/*.log
Expand Down
Loading

0 comments on commit 27b23f3

Please sign in to comment.