Skip to content

Commit a484f00

Browse files
Mpdreamzflobernd
Mpdreamz
authored and
flobernd
committed
Move away from shared project (#8376)
1 parent 8c3ab78 commit a484f00

File tree

314 files changed

+101
-15403
lines changed

Some content is hidden

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

314 files changed

+101
-15403
lines changed

Diff for: ‎.buildkite/DockerFile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG DOTNET_VERSION=8.0.100
1+
ARG DOTNET_VERSION=8.0.400
22
FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS elasticsearch-net-build
33

44
ENV NUGET_SCRATCH="/tmp/NuGetScratch"

Diff for: ‎.buildkite/pipeline.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
env:
66
TEST_SUITE: "{{ matrix.suite }}"
77
STACK_VERSION: master-SNAPSHOT
8-
DOTNET_VERSION: 8.0.100
8+
DOTNET_VERSION: 8.0.400
99
matrix:
1010
setup:
1111
suite:

Diff for: ‎.buildkite/run-repository.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ param(
1414
$NODE_NAME,
1515

1616
[string]
17-
$DOTNET_VERSION = "8.0.100"
17+
$DOTNET_VERSION = "8.0.400"
1818
)
1919

2020
$ESC = [char]27

Diff for: ‎.buildkite/run-repository.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ script_path=$(dirname $(realpath -s $0))
99
source $script_path/functions/imports.sh
1010
set -euo pipefail
1111

12-
DOTNET_VERSION=${DOTNET_VERSION-8.0.100}
12+
DOTNET_VERSION=${DOTNET_VERSION-8.0.400}
1313
ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"}
1414
elasticsearch_container=${elasticsearch_container-}
1515

Diff for: ‎.buildkite/run-tests.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ param (
88
$TEST_SUITE = "free",
99

1010
[string]
11-
$DOTNET_VERSION = "8.0.100"
11+
$DOTNET_VERSION = "8.0.400"
1212
)
1313

1414
$ESC = [char]27

Diff for: ‎.ci/DockerFile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG DOTNET_VERSION=8.0.100
1+
ARG DOTNET_VERSION=8.0.400
22
FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS elasticsearch-net-build
33

44
ENV NUGET_SCRATCH="/tmp/NuGetScratch"

Diff for: ‎.ci/make.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ OUTPUT_DIR="$repo/${output_folder}"
4242
REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}"
4343
mkdir -p "$OUTPUT_DIR"
4444

45-
DOTNET_VERSION=${DOTNET_VERSION-8.0.100}
45+
DOTNET_VERSION=${DOTNET_VERSION-8.0.400}
4646

4747
echo -e "\033[34;1mINFO:\033[0m PRODUCT ${product}\033[0m"
4848
echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m"
@@ -116,7 +116,7 @@ esac
116116
# ------------------------------------------------------- #
117117
# Build Container
118118
# ------------------------------------------------------- #
119-
119+
120120
echo -e "\033[34;1mINFO: building $product container\033[0m"
121121

122122
docker build --file .ci/DockerFile --tag ${product} \
@@ -140,7 +140,7 @@ docker run \
140140
--rm \
141141
${product} \
142142
/bin/bash -c "./build.sh $TASK ${TASK_ARGS[*]} && chown -R $(id -u):$(id -g) ."
143-
143+
144144
# ------------------------------------------------------- #
145145
# Post Command tasks & checks
146146
# ------------------------------------------------------- #
@@ -168,4 +168,4 @@ fi
168168

169169
if [[ "$CMD" == "examplesgen" ]]; then
170170
echo "TODO"
171-
fi
171+
fi

Diff for: ‎.ci/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ $ STACK_VERSION=8.0.0-SNAPSHOT ./.ci/run-tests
3030
|-------------------------|-------------|-------------|
3131
| `STACK_VERSION` | `N/A` | The elasticsearch version to target
3232
| `TEST_SUITE` | `basic` | `free` or `platinum` sets which test suite to run and which container to run against. |
33-
| `DOTNET_VERSION` | `8.0.100` | The .NET sdk version used to grab the proper container |
33+
| `DOTNET_VERSION` | `8.0.400` | The .NET sdk version used to grab the proper container |
3434

3535
If you want to manually spin up elasticsearch for these tests and call the runner afterwards you can use
3636

Diff for: ‎.ci/run-repository.ps1

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
param(
77
[System.Uri]
88
$ELASTICSEARCH_URL,
9-
9+
1010
[string]
1111
$NETWORK_NAME,
12-
12+
1313
[string]
1414
$NODE_NAME,
15-
15+
1616
[string]
17-
$DOTNET_VERSION = "8.0.100"
17+
$DOTNET_VERSION = "8.0.400"
1818
)
1919

2020
$ESC = [char]27
@@ -39,4 +39,4 @@ docker run `
3939
--volume $repo/build/output:/sln/build/output `
4040
--rm `
4141
elastic/elasticsearch-net `
42-
./build.sh rest-spec-tests -f count -e $ELASTICSEARCH_URL -o /sln/build/output/rest-spec-junit.xml
42+
./build.sh rest-spec-tests -f count -e $ELASTICSEARCH_URL -o /sln/build/output/rest-spec-junit.xml

Diff for: ‎.ci/run-repository.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ script_path=$(dirname $(realpath -s $0))
99
source $script_path/functions/imports.sh
1010
set -euo pipefail
1111

12-
DOTNET_VERSION=${DOTNET_VERSION-8.0.100}
12+
DOTNET_VERSION=${DOTNET_VERSION-8.0.400}
1313
ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"}
1414
elasticsearch_container=${elasticsearch_container-}
1515

@@ -27,13 +27,13 @@ fi
2727
if [[ "$TEST_SECTION" != "" ]]; then
2828
run_script_args="${run_script_args} -s ${TEST_SECTION}"
2929
fi
30-
30+
3131
echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m"
3232
echo -e "\033[34;1mINFO:\033[0m TEST_SUITE ${TEST_SUITE}\033[0m"
3333
echo -e "\033[34;1mINFO:\033[0m URL ${ELASTICSEARCH_URL}\033[0m"
3434
echo -e "\033[34;1mINFO:\033[0m CONTAINER ${elasticsearch_container}\033[0m"
3535
echo -e "\033[34;1mINFO:\033[0m DOTNET_VERSION ${DOTNET_VERSION}\033[0m"
36-
36+
3737
echo -e "\033[1m>>>>> Build [elastic/elasticsearch-net container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
3838

3939
docker build --file .ci/DockerFile --tag elastic/elasticsearch-net \

Diff for: ‎.ci/run-tests.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ param (
88
$TEST_SUITE = "free",
99

1010
[string]
11-
$DOTNET_VERSION = "8.0.100"
11+
$DOTNET_VERSION = "8.0.400"
1212
)
1313

1414
$ESC = [char]27
@@ -29,7 +29,7 @@ function cleanup {
2929
$runParams = @{
3030
NODE_NAME= $NODE_NAME
3131
NETWORK_NAME = "elasticsearch"
32-
CLEANUP = $true
32+
CLEANUP = $true
3333
}
3434

3535
./.ci/run-elasticsearch.ps1 @runParams
@@ -69,7 +69,7 @@ try {
6969

7070
./.ci/run-repository.ps1 @runParams
7171

72-
cleanup
72+
cleanup
7373
}
7474
catch {
7575
cleanup

Diff for: ‎.ci/test-matrix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ TEST_SUITE:
88
- platinum
99

1010
DOTNET_VERSION:
11-
- 8.0.100
11+
- 8.0.400
1212

1313
exclude: ~

Diff for: ‎.github/workflows/integration-jobs.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ on:
1414
- '[0-9]+.[0-9]+'
1515
- '[0-9]+.x'
1616

17+
env:
18+
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
19+
1720
jobs:
1821
integration-tests:
1922
name: Tests
@@ -34,17 +37,17 @@ jobs:
3437
'8.9.0-SNAPSHOT',
3538
'latest-8'
3639
]
37-
40+
3841
steps:
3942
- name: Checkout
4043
uses: actions/checkout@v3
4144
- uses: actions/setup-dotnet@v4
4245
with:
43-
dotnet-version: '8.0.100'
46+
global-json-file: 'global.json'
4447
- uses: actions/cache@v3
4548
with:
46-
path: ~/.nuget/packages
47-
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
49+
path: ${{ github.workspace }}/.nuget/packages
50+
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.[cf]sproj*', '**/*.Build.props') }}
4851
restore-keys: |
4952
${{ runner.os }}-nuget-
5053
- uses: actions/cache@v3
@@ -53,7 +56,7 @@ jobs:
5356
key: ${{ runner.os }}-elastic-managed-${{ matrix.stack_version }}
5457
restore-keys: |
5558
${{ runner.os }}-elastic-managed-
56-
59+
5760
- run: "./build.sh integrate ${{ matrix.stack_version }} random:test_only_one --report"
5861
name: ${{ matrix.stack_version }}
5962
- name: Results ${{ matrix.stack_version }}
@@ -66,4 +69,4 @@ jobs:
6669
fail_on_failure: true
6770
require_tests: true
6871
check_name: ${{ matrix.stack_version }}
69-
72+

Diff for: ‎.github/workflows/make-bump.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- run: "./.ci/make.sh bump ${{ github.event.inputs.version }}"
2121
name: "Bump ${{ github.event.inputs.version }} on ${{ github.event.inputs.branch }}"
2222
- name: "Version bump PR ${{ github.event.inputs.version }}"
23-
# fixate to known release.
23+
# fixate to known release.
2424
uses: peter-evans/create-pull-request@052fc72b4198ba9fbc81b818c6e1859f747d49a8
2525
with:
2626
token: ${{ secrets.GITHUB_TOKEN }}
@@ -30,15 +30,15 @@ jobs:
3030
commit-message: "[version] ${{ github.event.inputs.version }} bump"
3131
title: '[version] ${{ github.event.inputs.version }} bump'
3232
body: |
33-
Updates ${{ github.event.inputs.branch }} to version ${{ github.event.inputs.version }}.
33+
Updates ${{ github.event.inputs.branch }} to version ${{ github.event.inputs.version }}.
3434
labels: "infra,code-gen"
3535
# Add version and backport labels automatically
3636
- uses: actions/setup-dotnet@v4
3737
with:
38-
dotnet-version: '8.0.100'
38+
global-json-file: 'global.json'
3939
- name: Install dotnet-script
4040
run: dotnet tool install release-notes --tool-path dotnet-tool
4141

4242
- name: Run build script
4343
run: >
44-
dotnet-tool/release-notes apply-labels --version ${{ github.event.inputs.version }} ${{ github.event.organization.login }} ${{ github.event.repository.name }} --token ${{ secrets.GITHUB_TOKEN }} --backportlabelformat "Backport BRANCH"
44+
dotnet-tool/release-notes apply-labels --version ${{ github.event.inputs.version }} ${{ github.event.organization.login }} ${{ github.event.repository.name }} --token ${{ secrets.GITHUB_TOKEN }} --backportlabelformat "Backport BRANCH"

Diff for: ‎.github/workflows/make-release-notes.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ jobs:
2222
run: |
2323
curl -s "https://artifacts-api.elastic.co/v1/branches" | jq "[ .branches[] | select(. | startswith(\"6\") | not) ]" --compact-output
2424
curl -s "https://artifacts-api.elastic.co/v1/branches" | jq "[ .branches[] | select(. | startswith(\"6\") | not) ]" --compact-output > branches.json
25-
25+
2626
- id: set-matrix
2727
name: conditional command
2828
run: |
2929
if [[ "${{ github.event.inputs.branch }}" != "" ]]; then
3030
echo "::set-output name=matrix::['${{ github.event.inputs.branch }}']"
31-
elif [[ -f "branches.json" ]]; then
31+
elif [[ -f "branches.json" ]]; then
3232
echo "::set-output name=matrix::$(cat branches.json)"
33-
else
33+
else
3434
echo "::set-output name=matrix::[]"
3535
fi
3636
outputs:
3737
matrix: ${{ steps.set-matrix.outputs.matrix }}
38-
38+
3939
release-notes:
4040
name: Generate
4141
needs: active-branches
@@ -48,14 +48,14 @@ jobs:
4848
- uses: actions/checkout@v3
4949
with:
5050
ref: "${{ matrix.branch }}"
51-
51+
5252
- uses: actions/setup-dotnet@v4
5353
with:
54-
dotnet-version: '8.0.100'
54+
global-json-file: 'global.json'
5555
- name: Install dotnet-script
5656
run: dotnet tool install release-notes --tool-path dotnet-tool
5757

58-
- name: Set repository name environment variable
58+
- name: Set repository name environment variable
5959
run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
6060

6161
- name: Find versions for branch
@@ -65,14 +65,14 @@ jobs:
6565
echo "::set-output name=current::$(echo ${lines[0]})"
6666
echo "::set-output name=next::$(echo ${lines[1]})"
6767
echo ${lines[@]}
68-
68+
6969
- name: Generate release notes
7070
run: |
7171
dotnet-tool/release-notes "${{ github.repository_owner }}" "${{ env.repository_name }}" --version ${{ steps.versions.outputs.next }} --token ${{ secrets.GITHUB_TOKEN }} --format asciidoc --output docs/release-notes
7272
rm dotnet-tool/release-notes
7373
git status
7474
- name: "PR ${{ matrix.branch }}"
75-
# fixate to known release.
75+
# fixate to known release.
7676
uses: peter-evans/create-pull-request@052fc72b4198ba9fbc81b818c6e1859f747d49a8
7777
with:
7878
token: ${{ secrets.GITHUB_TOKEN }}
@@ -83,4 +83,4 @@ jobs:
8383
title: '[release-notes] Release notes ${{ steps.versions.outputs.next }} on ${{ matrix.branch }} branch'
8484
body: |
8585
Release notes ${{ steps.versions.outputs.next }} on ${{ matrix.branch }} branch
86-
labels: "infra,code-gen"
86+
labels: "infra,code-gen"

Diff for: ‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ env:
3131
# Configuration
3232
BUILD_CONFIG: 'Release'
3333
GLOBAL_JSON_FILE: 'global.json'
34-
LOCKFILE_PATTERN: '**/packages.lock.json'
34+
CACHE_PATTERNS: '["**/*.[cf]sproj*", "**/*.Build.props"]'
3535
PACKAGE_PATH: 'nupkg'
3636
# .NET SDK related environment variables
3737
DOTNET_NOLOGO: 1
@@ -63,7 +63,7 @@ jobs:
6363
uses: 'actions/cache@v4'
6464
with:
6565
path: '~/.nuget/packages'
66-
key: '${{ runner.os }}-nuget-${{ inputs.flavor }}-${{ hashFiles(env.LOCKFILE_PATTERN) }}'
66+
key: '${{ runner.os }}-nuget-${{ inputs.flavor }}-${{ hashFiles(fromJson(env.CACHE_PATTERNS)) }}'
6767
restore-keys: '${{ runner.os }}-nuget-${{ inputs.flavor }}-'
6868

6969
- name: '.NET Restore'

Diff for: ‎.github/workflows/stale-jobs.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ on:
1515
- '[0-9]+.[0-9]+'
1616
- '[0-9]+.x'
1717

18+
env:
19+
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
20+
1821
jobs:
1922
unit-tests:
2023
name: Documentation
@@ -24,17 +27,17 @@ jobs:
2427
uses: actions/checkout@v3
2528
- uses: actions/setup-dotnet@v4
2629
with:
27-
dotnet-version: '8.0.100'
30+
global-json-file: 'global.json'
2831
- uses: actions/cache@v3
2932
with:
30-
path: ~/.nuget/packages
31-
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
33+
path: ${{ github.workspace }}/.nuget/packages
34+
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.[cf]sproj*', '**/*.Build.props') }}
3235
restore-keys: |
3336
${{ runner.os }}-nuget-
3437
3538
- run: ./build.sh documentation
3639
name: Build docs
37-
40+
3841
- run: |
3942
if [ -n "$(git status --porcelain)" ]; then echo Error: changes found after running documentation; git diff; git status; exit 1; fi
4043
name: 'Ensure no stale docs'

0 commit comments

Comments
 (0)