Skip to content

Commit 728b329

Browse files
antontroshinantontroshin
authored
Merge branch 'master' into fix-perfsprint-linter-error
2 parents aefcca1 + c3f0fb2 commit 728b329

Some content is hidden

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

75 files changed

+1394
-2760
lines changed

‎.github/workflows/dapr_cli.yaml‎

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
name: Build ${{ matrix.target_os }}_${{ matrix.target_arch }} binaries
3030
runs-on: ${{ matrix.os }}
3131
env:
32-
GOLANG_CI_LINT_VER: v1.55.2
32+
GOLANG_CI_LINT_VER: v1.61.0
3333
GOOS: ${{ matrix.target_os }}
3434
GOARCH: ${{ matrix.target_arch }}
3535
GOPROXY: https://proxy.golang.org
@@ -73,42 +73,12 @@ jobs:
7373
echo "GOBIN=$HOME/bin" >> $GITHUB_ENV
7474
mkdir -p $HOME/bin
7575
- name: Check out code into the Go module directory
76-
uses: actions/checkout@v3
76+
uses: actions/checkout@v4
7777
- name: Set up Go
78-
uses: actions/setup-go@v3
78+
uses: actions/setup-go@v5
7979
id: setup-go
8080
with:
8181
go-version-file: 'go.mod'
82-
- name: Cache Go modules (Linux)
83-
if: matrix.target_os == 'linux'
84-
uses: actions/cache@v3
85-
with:
86-
path: |
87-
~/.cache/go-build
88-
~/go/pkg/mod
89-
key: ${{ matrix.target_os }}-${{ matrix.target_arch }}-go-${{ steps.setup-go.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
90-
restore-keys: |
91-
${{ matrix.target_os }}-${{ matrix.target_arch }}-go-${{ steps.setup-go.outputs.go-version }}-
92-
- name: Cache Go modules (Windows)
93-
if: matrix.target_os == 'windows'
94-
uses: actions/cache@v3
95-
with:
96-
path: |
97-
~\AppData\Local\go-build
98-
~\go\pkg\mod
99-
key: ${{ matrix.target_os }}-${{ matrix.target_arch }}-go-${{ steps.setup-go.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
100-
restore-keys: |
101-
${{ matrix.target_os }}-${{ matrix.target_arch }}-go-${{ steps.setup-go.outputs.go-version }}-
102-
- name: Cache Go modules (macOS)
103-
if: matrix.target_os == 'darwin'
104-
uses: actions/cache@v3
105-
with:
106-
path: |
107-
~/Library/Caches/go-build
108-
~/go/pkg/mod
109-
key: ${{ matrix.target_os }}-${{ matrix.target_arch }}-go-${{ steps.setup-go.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
110-
restore-keys: |
111-
${{ matrix.target_os }}-${{ matrix.target_arch }}-go-${{ steps.setup-go.outputs.go-version }}-
11282
- name: Run golangci-lint
11383
if: matrix.target_arch == 'amd64' && matrix.target_os == 'linux'
11484
uses: golangci/[email protected]
@@ -203,7 +173,7 @@ jobs:
203173
runs-on: windows-latest
204174
steps:
205175
- name: Check out code
206-
uses: actions/checkout@v3
176+
uses: actions/checkout@v4
207177
- name: Parse release version and set REL_VERSION
208178
run: python ./.github/scripts/get_release_version.py
209179
- name: Update winget manifests

‎.github/workflows/dev_container_feature_release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
pull-requests: write
1212
packages: write
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

1616
- name: "Publish Features"
1717
uses: devcontainers/action@v1

‎.github/workflows/dev_container_feature_test.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- ubuntu:latest
2323
- mcr.microsoft.com/devcontainers/base:ubuntu
2424
steps:
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626

2727
- name: "Install latest devcontainer CLI"
2828
run: npm install -g @devcontainers/cli
@@ -39,7 +39,7 @@ jobs:
3939
features:
4040
- dapr-cli
4141
steps:
42-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
4343

4444
- name: "Install latest devcontainer CLI"
4545
run: npm install -g @devcontainers/cli
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: ubuntu-latest
5353
continue-on-error: true
5454
steps:
55-
- uses: actions/checkout@v3
55+
- uses: actions/checkout@v4
5656

5757
- name: "Install latest devcontainer CLI"
5858
run: npm install -g @devcontainers/cli

‎.github/workflows/dev_container_feature_validate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
validate:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313

1414
- name: "Validate devcontainer-feature.json files"
1515
uses: devcontainers/action@v1

‎.github/workflows/fossa.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
FOSSA_API_KEY: b88e1f4287c3108c8751bf106fb46db6 # This is a push-only token that is safe to be exposed.
3535
steps:
3636
- name: "Checkout code"
37-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
3838

3939
- name: "Run FOSSA Scan"
4040
uses: fossas/[email protected] # Use a specific version if locking is preferred

‎.github/workflows/installdaprwin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
41-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4242

4343
# Install Dapr
4444
- name: Install DAPR CLI

‎.github/workflows/kind_e2e.yaml‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,10 @@ jobs:
5050
name: E2E tests for K8s (KinD)
5151
runs-on: ubuntu-latest
5252
env:
53-
DAPR_RUNTIME_PINNED_VERSION: 1.13.0-rc.2
53+
DAPR_RUNTIME_PINNED_VERSION: 1.13.5
5454
DAPR_DASHBOARD_PINNED_VERSION: 0.14.0
5555
DAPR_RUNTIME_LATEST_STABLE_VERSION:
5656
DAPR_DASHBOARD_LATEST_STABLE_VERSION:
57-
DAPR_TGZ: dapr-1.13.0-rc.2.tgz
5857
strategy:
5958
fail-fast: false # Keep running if one leg fails.
6059
matrix:
@@ -80,23 +79,14 @@ jobs:
8079
kind-image-sha: sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace
8180
steps:
8281
- name: Check out code onto GOPATH
83-
uses: actions/checkout@v3
82+
uses: actions/checkout@v4
8483
with:
8584
path: ./src/github.com/dapr/cli
8685
- name: Set up Go
87-
uses: actions/setup-go@v3
86+
uses: actions/setup-go@v5
8887
id: setup-go
8988
with:
9089
go-version-file: './src/github.com/dapr/cli/go.mod'
91-
- name: Cache Go modules
92-
uses: actions/cache@v3
93-
with:
94-
path: |
95-
~/.cache/go-build
96-
~/go/pkg/mod
97-
key: ${{ matrix.k8s-version }}-${{ matrix.kind-version }}-go-${{ steps.setup-go.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
98-
restore-keys: |
99-
${{ matrix.k8s-version }}-${{ matrix.kind-version }}-go-${{ steps.setup-go.outputs.go-version }}-
10090

10191
- name: Configure KinD
10292
# Generate a KinD configuration file that uses:

‎.github/workflows/self_hosted_e2e.yaml‎

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ jobs:
3838
GOARCH: ${{ matrix.target_arch }}
3939
GOPROXY: https://proxy.golang.org
4040
ARCHIVE_OUTDIR: dist/archives
41-
DAPR_RUNTIME_PINNED_VERSION: "1.13.0-rc.2"
41+
DAPR_RUNTIME_PINNED_VERSION: "1.13.5"
4242
DAPR_DASHBOARD_PINNED_VERSION: 0.14.0
4343
DAPR_RUNTIME_LATEST_STABLE_VERSION: ""
4444
DAPR_DASHBOARD_LATEST_STABLE_VERSION: ""
4545
GOLANG_PROTOBUF_REGISTRATION_CONFLICT: warn
46-
PODMAN_VERSION: 4.4.4
46+
PODMAN_VERSION: 4.9.3
4747
strategy:
4848
# TODO: Remove this when our E2E tests are stable for podman on MacOS.
4949
fail-fast: false # Keep running if one leg fails.
@@ -72,42 +72,12 @@ jobs:
7272
echo "GOBIN=$HOME/bin" >> $GITHUB_ENV
7373
mkdir -p $HOME/bin
7474
- name: Check out code into the Go module directory
75-
uses: actions/checkout@v3
75+
uses: actions/checkout@v4
7676
- name: Set up Go
77-
uses: actions/setup-go@v3
77+
uses: actions/setup-go@v5
7878
id: setup-go
7979
with:
8080
go-version-file: "go.mod"
81-
- name: Cache Go modules (Linux)
82-
if: matrix.target_os == 'linux'
83-
uses: actions/cache@v3
84-
with:
85-
path: |
86-
~/.cache/go-build
87-
~/go/pkg/mod
88-
key: ${{ matrix.target_os }}-${{ matrix.target_arch }}-go-${{ steps.setup-go.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
89-
restore-keys: |
90-
${{ matrix.target_os }}-${{ matrix.target_arch }}-go-${{ steps.setup-go.outputs.go-version }}-
91-
- name: Cache Go modules (Windows)
92-
if: matrix.target_os == 'windows'
93-
uses: actions/cache@v3
94-
with:
95-
path: |
96-
~\AppData\Local\go-build
97-
~\go\pkg\mod
98-
key: ${{ matrix.target_os }}-${{ matrix.target_arch }}-go-${{ steps.setup-go.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
99-
restore-keys: |
100-
${{ matrix.target_os }}-${{ matrix.target_arch }}-go-${{ steps.setup-go.outputs.go-version }}-
101-
- name: Cache Go modules (macOS)
102-
if: matrix.target_os == 'darwin'
103-
uses: actions/cache@v3
104-
with:
105-
path: |
106-
~/Library/Caches/go-build
107-
~/go/pkg/mod
108-
key: ${{ matrix.target_os }}-${{ matrix.target_arch }}-go-${{ steps.setup-go.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
109-
restore-keys: |
110-
${{ matrix.target_os }}-${{ matrix.target_arch }}-go-${{ steps.setup-go.outputs.go-version }}-
11181
- name: Install podman - MacOS
11282
timeout-minutes: 15
11383
if: matrix.os == 'macos-latest-large' && matrix.dapr_install_mode == 'complete'
@@ -120,8 +90,9 @@ jobs:
12090
12191
# Start podman machine
12292
sudo podman-mac-helper install
123-
podman machine init
93+
podman machine init -v $HOME:$HOME
12494
podman machine start --log-level debug
95+
podman machine ssh sudo sysctl -w kernel.keys.maxkeys=20000
12596
echo "CONTAINER_RUNTIME=podman" >> $GITHUB_ENV
12697
- name: Determine latest Dapr Runtime version including Pre-releases
12798
if: github.base_ref == 'master'

‎.github/workflows/upgrade_e2e.yaml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,24 +74,14 @@ jobs:
7474
kind-image-sha: sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace
7575
steps:
7676
- name: Check out code onto GOPATH
77-
uses: actions/checkout@v3
77+
uses: actions/checkout@v4
7878
with:
7979
path: ./src/github.com/dapr/cli
8080
- name: Set up Go
81-
uses: actions/setup-go@v3
81+
uses: actions/setup-go@v5
8282
id: setup-go
8383
with:
8484
go-version-file: './src/github.com/dapr/cli/go.mod'
85-
- name: Cache Go modules
86-
uses: actions/cache@v3
87-
with:
88-
path: |
89-
~/.cache/go-build
90-
~/go/pkg/mod
91-
key: ${{ matrix.k8s-version }}-${{ matrix.kind-version }}-go-${{ steps.setup-go.outputs.go-version }}-${{ hashFiles('**/go.sum') }}
92-
restore-keys: |
93-
${{ matrix.k8s-version }}-${{ matrix.kind-version }}-go-${{ steps.setup-go.outputs.go-version }}-
94-
9585

9686
- name: Configure KinD
9787
# Generate a KinD configuration file that uses:

0 commit comments

Comments
 (0)