Skip to content

Commit

Permalink
Merge branch 'master' into injector-patcher-daprd-sentry-audience
Browse files Browse the repository at this point in the history
  • Loading branch information
dapr-bot committed Jan 16, 2024
2 parents 79cb3f3 + 525a3de commit 08125f6
Show file tree
Hide file tree
Showing 17 changed files with 118 additions and 276 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/create-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install required packages
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dapr-3rdparty-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- # ghcr logins for pushing image after testing
name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_REGISTRY_ID }}
password: ${{ secrets.DOCKER_REGISTRY_PASS }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dapr-base-containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
}
- name: Check out dapr
if: env.CHECKOUT_REPO != ''
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ env.CHECKOUT_REPO }}
ref: ${{ env.CHECKOUT_REF }}
Expand All @@ -74,7 +74,7 @@ jobs:
docker login -u ${{ secrets.DOCKER_REGISTRY_ID }} -p ${{ secrets.DOCKER_REGISTRY_PASS }}
- name: GitHub container registry login
if: env.CHECKOUT_REPO != ''
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dapr-bot-schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install dependencies
run: pip install PyGithub
- name: Automerge and update
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dapr-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3 # required to make the script available for next step
uses: actions/checkout@v4 # required to make the script available for next step
- name: Comment analyzer
uses: actions/github-script@v6
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dapr-dev-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,27 @@ jobs:
DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set REPO_OWNER
shell: bash
run: |
REPO_OWNER=${{ github.repository_owner }}
# Lowercase the value
echo "REPO_OWNER=${REPO_OWNER,,}" >>${GITHUB_ENV}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
image: tonistiigi/binfmt:latest
platforms: arm64
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Docker Hub login
if: github.event_name != 'pull_request'
run: |
docker login -u ${{ secrets.DOCKER_REGISTRY_ID }} -p ${{ secrets.DOCKER_REGISTRY_PASS }}
- name: GitHub Container Registry login
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand Down
36 changes: 8 additions & 28 deletions .github/workflows/dapr-perf-components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
Commit ref: ${{ env.CHECKOUT_REF }}
- name: Check out code
if: env.CHECKOUT_REPO != ''
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ env.CHECKOUT_REPO }}
ref: ${{ env.CHECKOUT_REF }}
Expand Down Expand Up @@ -214,25 +214,15 @@ jobs:
}
- name: Check out code
if: env.CHECKOUT_REPO != ''
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ env.CHECKOUT_REPO }}
ref: ${{ env.CHECKOUT_REF }}
- name: Set up Go
id: setup-go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
- name: Cache Go modules (perf)
if: env.CHECKOUT_REPO != '' && runner.os == 'Linux'
uses: actions/cache@v3
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-perf-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-perf-
- name: Login to Azure
if: env.CHECKOUT_REPO != ''
uses: azure/login@v1
Expand Down Expand Up @@ -369,25 +359,15 @@ jobs:
}
- name: Check out code
if: env.CHECKOUT_REPO != ''
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ env.CHECKOUT_REPO }}
ref: ${{ env.CHECKOUT_REF }}
- name: Set up Go
id: setup-go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
- name: Cache Go modules (perf-test)
if: env.CHECKOUT_REPO != '' && runner.os == 'Linux'
uses: actions/cache@v3
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-perf-test-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-perf-test-
- uses: azure/setup-kubectl@v3
with:
version: ${{ env.KUBECTLVER }}
Expand Down Expand Up @@ -449,19 +429,19 @@ jobs:
make save-dapr-control-plane-k8s-logs
- name: Upload container logs
if: always() && env.TEST_PREFIX != ''
uses: actions/upload-artifact@master
uses: actions/upload-artifact@v4
with:
name: perf_container_logs
path: ${{ env.DAPR_CONTAINER_LOG_PATH }}
- name: Upload test logs
if: always()
uses: actions/upload-artifact@master
uses: actions/upload-artifact@v4
with:
name: perf_test_logs
path: ${{ env.DAPR_TEST_LOG_PATH }}
- name: Upload test results
if: always()
uses: actions/upload-artifact@master
uses: actions/upload-artifact@v4
with:
#TODO: .json suffix can be removed from artifact name after test analytics scripts are updated
name: test_perf.json
Expand Down
36 changes: 8 additions & 28 deletions .github/workflows/dapr-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
Commit ref: ${{ env.CHECKOUT_REF }}
- name: Check out code
if: env.CHECKOUT_REPO != ''
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ env.CHECKOUT_REPO }}
ref: ${{ env.CHECKOUT_REF }}
Expand Down Expand Up @@ -236,25 +236,15 @@ jobs:
}
- name: Check out code
if: env.CHECKOUT_REPO != ''
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ env.CHECKOUT_REPO }}
ref: ${{ env.CHECKOUT_REF }}
- name: Set up Go
id: setup-go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
- name: Cache Go modules (perf)
if: env.CHECKOUT_REPO != '' && runner.os == 'Linux'
uses: actions/cache@v3
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-perf-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-perf-
- name: Login to Azure
if: env.CHECKOUT_REPO != ''
uses: azure/login@v1
Expand Down Expand Up @@ -403,25 +393,15 @@ jobs:
}
- name: Check out code
if: env.CHECKOUT_REPO != ''
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ env.CHECKOUT_REPO }}
ref: ${{ env.CHECKOUT_REF }}
- name: Set up Go
id: setup-go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
- name: Cache Go modules (perf-test)
if: env.CHECKOUT_REPO != '' && runner.os == 'Linux'
uses: actions/cache@v3
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-perf-test-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-perf-test-
- uses: azure/setup-kubectl@v3
with:
version: ${{ env.KUBECTLVER }}
Expand Down Expand Up @@ -480,19 +460,19 @@ jobs:
make save-dapr-control-plane-k8s-logs
- name: Upload container logs
if: always() && env.TEST_PREFIX != ''
uses: actions/upload-artifact@master
uses: actions/upload-artifact@v4
with:
name: perf_container_logs
path: ${{ env.DAPR_CONTAINER_LOG_PATH }}
- name: Upload test logs
if: always()
uses: actions/upload-artifact@master
uses: actions/upload-artifact@v4
with:
name: perf_test_logs
path: ${{ env.DAPR_TEST_LOG_PATH }}
- name: Upload test results
if: always()
uses: actions/upload-artifact@master
uses: actions/upload-artifact@v4
with:
#TODO: .json suffix can be removed from artifact name after test analytics scripts are updated
name: test_perf.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dapr-release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install dependencies
run: pip install PyGithub
- name: Generate release notes
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dapr-standalone-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,20 @@ jobs:
- name: Initialize with latest Dapr runtime
run: dapr init --slim
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ env.CHECKOUT_REPO }}
ref: ${{ env.CHECKOUT_REF }}
- name: Set up Go
id: setup-go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
- name: Build Dapr's sidecar
run: make ./dist/${GOOS}_${GOARCH}/release/daprd
- name: Check out code at master branch for PR validation
if: github.event_name == 'pull_request'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ env.CHECKOUT_REPO }}
ref: master
Expand Down

0 comments on commit 08125f6

Please sign in to comment.