未验证 提交 ff90f5b5 编写于 作者: A Alessandro (Ale) Segala 提交者: GitHub

Merge branch 'master' into aks-arm

......@@ -70,7 +70,7 @@
"go.toolsManagement.checkForUpdates": "local",
"go.useLanguageServer": true,
"go.gopath": "/go",
"go.buildTags": "e2e,perf,conftests,unit,integration_test,certtests,all_components",
"go.buildTags": "e2e,perf,conftests,unit,integration_test,certtests,allcomponents",
"git.alwaysSignOff": true,
"terminal.integrated.env.linux": {
"GOLANG_PROTOBUF_REGISTRATION_CONFLICT": "ignore"
......
......@@ -87,7 +87,7 @@ jobs:
with:
version: ${{ env.GOLANGCILINT_VER }}
skip-cache: true
args: --build-tags all_components
args: --build-tags allcomponents
- name: Run go mod tidy check diff
run: make modtidy check-diff
- name: Run gen-proto check diff
......@@ -192,54 +192,54 @@ jobs:
target_os: linux
target_arch: amd64
job_name: "Linux/amd64"
sidecar_flavor: "all"
sidecar_flavor: "allcomponents"
- os: ubuntu-latest
target_os: linux
target_arch: amd64
job_name: "Linux/amd64"
sidecar_flavor: "stable"
sidecar_flavor: "stablecomponents"
- os: ubuntu-latest
target_os: linux
target_arch: arm64
job_name: "Linux/arm64"
sidecar_flavor: "all"
sidecar_flavor: "allcomponents"
- os: ubuntu-latest
target_os: linux
target_arch: arm64
job_name: "Linux/arm64"
sidecar_flavor: "stable"
sidecar_flavor: "stablecomponents"
- os: ubuntu-latest
target_os: linux
target_arch: arm
job_name: "Linux/arm"
sidecar_flavor: "all"
sidecar_flavor: "allcomponents"
- os: ubuntu-latest
target_os: linux
target_arch: arm
job_name: "Linux/arm"
sidecar_flavor: "stable"
sidecar_flavor: "stablecomponents"
- os: windows-2019
target_os: windows
target_arch: amd64
windows_version: "1809"
job_name: "Windows 1809"
sidecar_flavor: "all"
sidecar_flavor: "allcomponents"
- os: windows-2022
target_os: windows
target_arch: amd64
windows_version: ltsc2022
job_name: "Windows LTSC 2022"
sidecar_flavor: "all"
sidecar_flavor: "allcomponents"
- os: macOS-latest
target_os: darwin
target_arch: amd64
job_name: "macOS/Intel"
sidecar_flavor: "all"
sidecar_flavor: "allcomponents"
- os: macOS-latest
target_os: darwin
target_arch: arm64
job_name: "macOS/Apple Silicon"
sidecar_flavor: "all"
sidecar_flavor: "allcomponents"
steps:
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
......@@ -262,7 +262,7 @@ jobs:
- name: Parse release version and set REL_VERSION and LATEST_RELEASE
run: python ./.github/scripts/get_release_version.py ${{ github.event_name }}
- name: Updates version for sidecar flavor
if: matrix.sidecar_flavor != 'all'
if: matrix.sidecar_flavor != 'allcomponents'
run: |
echo "REL_VERSION=${REL_VERSION}-${{matrix.sidecar_flavor}}" >>${GITHUB_ENV}
# Only sidecar is built
......@@ -310,7 +310,7 @@ jobs:
GOOS: ${{ matrix.target_os }}
GOARCH: ${{ matrix.target_arch }}
ARCHIVE_OUT_DIR: ${{ env.ARCHIVE_OUTDIR }}
if: matrix.sidecar_flavor == 'all'
if: matrix.sidecar_flavor == 'allcomponents'
run: |
mkdir -p "${ARCHIVE_OUT_DIR}"
make release
......@@ -321,7 +321,7 @@ jobs:
GOARCH: ${{ matrix.target_arch }}
ARCHIVE_OUT_DIR: ${{ env.ARCHIVE_OUTDIR }}
DAPR_SIDECAR_FLAVOR: "${{ matrix.sidecar_flavor }}"
if: matrix.sidecar_flavor != 'all'
if: matrix.sidecar_flavor != 'allcomponents'
run: |
mkdir -p "${ARCHIVE_OUT_DIR}"
make release-flavor
......@@ -332,7 +332,7 @@ jobs:
name: dapr_${{ matrix.target_os }}_${{ matrix.target_arch }}_${{ matrix.sidecar_flavor }}
path: ${{ env.ARCHIVE_OUTDIR }}
- name: upload artifacts - grafana dashboards
if: matrix.target_arch == 'amd64' && matrix.target_os == 'linux' && matrix.sidecar_flavor == 'all'
if: matrix.target_arch == 'amd64' && matrix.target_os == 'linux' && matrix.sidecar_flavor == 'allcomponents'
uses: actions/upload-artifact@master
with:
name: dapr_grafana_dashboards
......@@ -495,10 +495,10 @@ jobs:
strategy:
fail-fast: false
matrix:
sidecar_flavor: ["all", "stable"]
sidecar_flavor: ["allcomponents", "stablecomponents"]
target_os: ["linux", "windows"]
exclude:
- sidecar_flavor: "stable"
- sidecar_flavor: "stablecomponents"
target_os: "windows"
steps:
- name: Check out code into the Go module directory
......@@ -506,7 +506,7 @@ jobs:
- name: Parse release version and set REL_VERSION and LATEST_RELEASE
run: python ./.github/scripts/get_release_version.py ${{ github.event_name }}
- name: Updates version for sidecar flavor
if: matrix.sidecar_flavor != 'all'
if: matrix.sidecar_flavor != 'allcomponents'
run: |
echo "REL_VERSION=${REL_VERSION}-${{matrix.sidecar_flavor}}" >>${GITHUB_ENV}
echo "LATEST_TAG=latest-${{matrix.sidecar_flavor}}" >>${GITHUB_ENV}
......@@ -553,7 +553,7 @@ jobs:
make docker-publish
shell: bash
- name: Build and push Docker multiarch Windows manifest to Docker Hub
if: matrix.target_os != 'darwin' && env.DOCKER_REGISTRY_ID != '' && matrix.sidecar_flavor == 'all'
if: matrix.target_os != 'darwin' && env.DOCKER_REGISTRY_ID != '' && matrix.sidecar_flavor == 'allcomponents'
env:
DOCKER_REGISTRY_ID: ${{ secrets.DOCKER_REGISTRY_ID }}
DAPR_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
......@@ -582,7 +582,7 @@ jobs:
LATEST_TAG=${{ env.LATEST_TAG }}-mariner \
make docker-publish
- name: Build and push Docker multiarch Windows manifest to GHCR
if: matrix.target_os != 'darwin' && matrix.sidecar_flavor == 'all'
if: matrix.target_os != 'darwin' && matrix.sidecar_flavor == 'allcomponents'
env:
DAPR_REGISTRY: ghcr.io/${{ env.REPO_OWNER }}
run: |
......
......@@ -28,10 +28,10 @@ HA_MODE ?= false
# Force in-memory log for placement
FORCE_INMEM ?= true
# Go's build tags:
# all_components - includes all components in Dapr sidecar
# stable_components - includes all stable components in Dapr sidecar
DAPR_SIDECAR_FLAVOR ?= all
DAPR_GO_BUILD_TAGS = $(DAPR_SIDECAR_FLAVOR)_components
# allcomponents - (default) includes all components in Dapr sidecar
# stablecomponents - includes all stable components in Dapr sidecar
DAPR_SIDECAR_FLAVOR ?= allcomponents
DAPR_GO_BUILD_TAGS = $(DAPR_SIDECAR_FLAVOR)
# Add latest tag if LATEST_RELEASE is true
LATEST_RELEASE ?=
......@@ -300,9 +300,9 @@ test: test-deps
--format standard-quiet \
-- \
./pkg/... ./utils/... ./cmd/... \
$(COVERAGE_OPTS) --tags=unit,all_components
$(COVERAGE_OPTS) --tags=unit,allcomponents
CGO_ENABLED=$(CGO) \
go test --tags=all_components ./tests/...
go test --tags=allcomponents ./tests/...
################################################################################
# Target: test-race #
......@@ -341,7 +341,7 @@ TEST_WITH_RACE=./pkg/acl/... \
.PHONY: test-race
test-race:
echo "$(TEST_WITH_RACE)" | xargs \
go test -tags="all_components unit" -race
go test -tags="allcomponents unit" -race
################################################################################
# Target: lint #
......@@ -350,7 +350,7 @@ test-race:
# You can download version v1.51.2 at https://github.com/golangci/golangci-lint/releases/tag/v1.51.2
.PHONY: lint
lint:
$(GOLANGCI_LINT) run --build-tags=all_components --timeout=20m
$(GOLANGCI_LINT) run --build-tags=allcomponents --timeout=20m
################################################################################
# Target: modtidy-all #
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build !(linux && arm) && all_components
//go:build !(linux && arm) && allcomponents
// +build !linux !arm
// +build all_components
// +build allcomponents
/*
Copyright 2023 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2023 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2023 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2023 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2023 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2023 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components || stable_components
//go:build allcomponents || stablecomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2021 The Dapr Authors
......
//go:build all_components
//go:build allcomponents
/*
Copyright 2023 The Dapr Authors
......
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册