mirror of https://github.com/dapr/java-sdk.git
Merge branch 'master' into mm-wait-for-dapr
This commit is contained in:
commit
f70f005290
|
|
@ -22,7 +22,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v5
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: pip install PyGithub
|
run: pip install PyGithub
|
||||||
- name: Automerge and update
|
- name: Automerge and update
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ jobs:
|
||||||
uses: docker/setup-docker-action@v4
|
uses: docker/setup-docker-action@v4
|
||||||
- name: Check Docker version
|
- name: Check Docker version
|
||||||
run: docker version
|
run: docker version
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- name: Set up OpenJDK ${{ env.JDK_VER }}
|
- name: Set up OpenJDK ${{ env.JDK_VER }}
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
|
|
@ -64,14 +64,14 @@ jobs:
|
||||||
with:
|
with:
|
||||||
go-version: ${{ env.GOVER }}
|
go-version: ${{ env.GOVER }}
|
||||||
- name: Checkout Dapr CLI repo to override dapr command.
|
- name: Checkout Dapr CLI repo to override dapr command.
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v5
|
||||||
if: env.DAPR_CLI_REF != ''
|
if: env.DAPR_CLI_REF != ''
|
||||||
with:
|
with:
|
||||||
repository: dapr/cli
|
repository: dapr/cli
|
||||||
ref: ${{ env.DAPR_CLI_REF }}
|
ref: ${{ env.DAPR_CLI_REF }}
|
||||||
path: cli
|
path: cli
|
||||||
- name: Checkout Dapr repo to override daprd.
|
- name: Checkout Dapr repo to override daprd.
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v5
|
||||||
if: env.DAPR_REF != ''
|
if: env.DAPR_REF != ''
|
||||||
with:
|
with:
|
||||||
repository: dapr/dapr
|
repository: dapr/dapr
|
||||||
|
|
@ -159,7 +159,7 @@ jobs:
|
||||||
GPG_KEY: ${{ secrets.GPG_KEY }}
|
GPG_KEY: ${{ secrets.GPG_KEY }}
|
||||||
GPG_PWD: ${{ secrets.GPG_PWD }}
|
GPG_PWD: ${{ secrets.GPG_PWD }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- name: Set up OpenJDK ${{ env.JDK_VER }}
|
- name: Set up OpenJDK ${{ env.JDK_VER }}
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ jobs:
|
||||||
JDK_VER: '17'
|
JDK_VER: '17'
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code
|
- name: Check out code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v5
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
token: ${{ secrets.DAPR_BOT_TOKEN }}
|
token: ${{ secrets.DAPR_BOT_TOKEN }}
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ jobs:
|
||||||
FOSSA_API_KEY: b88e1f4287c3108c8751bf106fb46db6 # This is a push-only token that is safe to be exposed.
|
FOSSA_API_KEY: b88e1f4287c3108c8751bf106fb46db6 # This is a push-only token that is safe to be exposed.
|
||||||
steps:
|
steps:
|
||||||
- name: "Checkout code"
|
- name: "Checkout code"
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v5
|
||||||
|
|
||||||
- name: "Run FOSSA Scan"
|
- name: "Run FOSSA Scan"
|
||||||
uses: fossas/fossa-action@v1.7.0 # Use a specific version if locking is preferred
|
uses: fossas/fossa-action@v1.7.0 # Use a specific version if locking is preferred
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ jobs:
|
||||||
env:
|
env:
|
||||||
JDK_VER: 17
|
JDK_VER: 17
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- name: Set up OpenJDK ${{ env.JDK_VER }}
|
- name: Set up OpenJDK ${{ env.JDK_VER }}
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ jobs:
|
||||||
DAPR_CLI_REF:
|
DAPR_CLI_REF:
|
||||||
DAPR_REF:
|
DAPR_REF:
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- name: Set up OpenJDK ${{ env.JDK_VER }}
|
- name: Set up OpenJDK ${{ env.JDK_VER }}
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
|
|
@ -62,14 +62,14 @@ jobs:
|
||||||
with:
|
with:
|
||||||
go-version: ${{ env.GOVER }}
|
go-version: ${{ env.GOVER }}
|
||||||
- name: Checkout Dapr CLI repo to override dapr command.
|
- name: Checkout Dapr CLI repo to override dapr command.
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v5
|
||||||
if: env.DAPR_CLI_REF != ''
|
if: env.DAPR_CLI_REF != ''
|
||||||
with:
|
with:
|
||||||
repository: dapr/cli
|
repository: dapr/cli
|
||||||
ref: ${{ env.DAPR_CLI_REF }}
|
ref: ${{ env.DAPR_CLI_REF }}
|
||||||
path: cli
|
path: cli
|
||||||
- name: Checkout Dapr repo to override daprd.
|
- name: Checkout Dapr repo to override daprd.
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v5
|
||||||
if: env.DAPR_REF != ''
|
if: env.DAPR_REF != ''
|
||||||
with:
|
with:
|
||||||
repository: dapr/dapr
|
repository: dapr/dapr
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue