File tree Expand file tree Collapse file tree 4 files changed +54
-2
lines changed Expand file tree Collapse file tree 4 files changed +54
-2
lines changed Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ repo=$(realpath "$script_path/../")
11
11
# shellcheck disable=SC1090
12
12
CMD=$1
13
13
TASK=$1
14
+ TASK_ARGS=()
14
15
VERSION=$2
15
16
STACK_VERSION=$VERSION
16
17
set -euo pipefail
@@ -32,8 +33,14 @@ docker build --file .ci/DockerFile --tag elastic/elasticsearch-net .
32
33
echo -e " \033[1m>>>>> Run [elastic/elasticsearch-net container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
33
34
34
35
case $CMD in
36
+ clean)
37
+ echo -e " \033[36;1mRemoving $output_folder \033[0m"
38
+ TASK=clean
39
+ rm -rf " $output_folder "
40
+ ;;
35
41
assemble)
36
42
TASK=release
43
+ TASK_ARGS=(" $VERSION " " $output_folder " " skiptests" )
37
44
;;
38
45
* )
39
46
echo -e " \nUsage:\n\t $CMD is not supported right now\n"
@@ -47,4 +54,4 @@ docker run \
47
54
--volume " ${OUTPUT_DIR} :/sln/${output_folder} " \
48
55
--rm \
49
56
elastic/elasticsearch-net \
50
- ./build.sh release " $VERSION " " $output_folder " " skiptests "
57
+ ./build.sh $TASK " ${TASK_ARGS[@]} "
Original file line number Diff line number Diff line change
1
+ name : Unified Release
2
+
3
+
4
+ on :
5
+ pull_request :
6
+ paths-ignore :
7
+ - ' README.md'
8
+ - ' .editorconfig'
9
+ push :
10
+ paths-ignore :
11
+ - ' README.md'
12
+ - ' .editorconfig'
13
+ branches :
14
+ - main
15
+ - master
16
+ - ' [0-9]+.[0-9]+'
17
+ - ' [0-9]+.x'
18
+
19
+ jobs :
20
+ assemble :
21
+ name : Assemble
22
+ runs-on : ubuntu-latest
23
+ strategy :
24
+ fail-fast : false
25
+ matrix :
26
+ stack_version : [ '8.0.0-SNAPSHOT']
27
+
28
+ steps :
29
+ - name : Checkout
30
+ uses : actions/checkout@v2
31
+ - uses : actions/setup-dotnet@v1
32
+ with :
33
+ dotnet-version : ' 5.0.100'
34
+
35
+ - run : " ./.ci/make.sh assemble ${{ matrix.stack_version }}"
36
+ name : Assemble ${{ matrix.stack_version }}
37
+
Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ open System.IO
10
10
open Bullseye
11
11
open ProcNet
12
12
open Fake.Core
13
+ open Fake.IO .Globbing .Operators
13
14
14
15
module Main =
15
16
@@ -60,7 +61,7 @@ module Main =
60
61
let canaryChain = [ " version" ; " release" ; " test-nuget-package" ;]
61
62
62
63
// the following are expected to be called as targets directly
63
- conditional " clean" parsed.ReleaseBuild <| fun _ -> Build.Clean parsed
64
+ conditional " clean" ( parsed.ReleaseBuild || parsed.Target = " clean " ) <| fun _ -> Build.Clean parsed
64
65
target " version" <| fun _ -> printfn " Artifacts Version: %O " artifactsVersion
65
66
66
67
target " restore" Build.Restore
@@ -92,6 +93,10 @@ module Main =
92
93
printfn " Finished Release Build %O , artifacts available at: %s " artifactsVersion Paths.BuildOutput
93
94
| Some path ->
94
95
Fake.IO.Shell.cp_ r Paths.BuildOutput path
96
+ let zipName = sprintf " elasticsearch-net-%O .zip" artifactsVersion.Full
97
+ let outputZip = Path.Combine( path, zipName)
98
+ let files = !! ( sprintf " %s /*.*" path) -- outputZip
99
+ Fake.IO.Zip.createZip " ." outputZip " elastic/elasticsearch-net artifact" 9 true files
95
100
printfn " Finished Release Build %O , output copied to: %s " artifactsVersion path
96
101
97
102
conditional " test-nuget-package" ( not parsed.SkipTests) <| fun _ -> Tests.RunReleaseUnitTests artifactsVersion parsed
Original file line number Diff line number Diff line change 28
28
<Content Include =" ..\..\.github\workflows\test-jobs.yml" ><Link >test-jobs.yml</Link ></Content >
29
29
<Content Include =" ..\..\.github\workflows\stale-jobs.yml" ><Link >stale-jobs.yml</Link ></Content >
30
30
<Content Include =" ..\..\.github\workflows\integration-jobs.yml" ><Link >integration-jobs.yml</Link ></Content >
31
+ <Content Include =" ..\..\.github\workflows\unified-release.yml" >
32
+ <Link >unified-release.yml</Link >
33
+ </Content >
31
34
</ItemGroup >
32
35
<ItemGroup >
33
36
<PackageReference Include =" FSharp.Core" Version =" 5.0.0" />
You can’t perform that action at this time.
0 commit comments