+semver: major updated build

ThreeMammals · Apr 22, 2023 · 8920836 · 8920836
1 parent c444c25
commit 8920836
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 49 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,13 +4,13 @@ orbs:
 jobs:
   build:
     docker:
-      - image: mijitt0m/ocelot-build:0.0.6
+      - image: mijitt0m/ocelot-build:0.0.7
     steps:
       - checkout
       - run: dotnet tool restore && dotnet cake
   release:
     docker:
-      - image: mijitt0m/ocelot-build:0.0.6
+      - image: mijitt0m/ocelot-build:0.0.7
     steps:
       - checkout
       - run: dotnet tool restore && dotnet cake --target=Release

diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
@@ -1,10 +1,9 @@
-# syntax=docker/dockerfile:1
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine
+FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine
 
 RUN apk add bash icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib
 
 RUN curl -L --output ./dotnet-install.sh https://dot.net/v1/dotnet-install.sh
 
 RUN chmod u+x ./dotnet-install.sh 
 
-RUN ./dotnet-install.sh -c 5.0 -i /usr/share/dotnet
+RUN ./dotnet-install.sh -c 6.0 -i /usr/share/dotnet
diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build
@@ -1,8 +1,7 @@
-# syntax=docker/dockerfile:1
 # call from ocelot repo root with
 # docker build --platform linux/arm64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
 # docker build --platform linux/amd64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
-FROM mijitt0m/ocelot-build:0.0.6
+FROM mijitt0m/ocelot-build:0.0.7
 
 ARG OCELOT_COVERALLS_TOKEN
 

diff --git a/docker/Dockerfile.release b/docker/Dockerfile.release
@@ -1,8 +1,7 @@
-# syntax=docker/dockerfile:1
 # call from ocelot repo root with
 # docker build --platform linux/arm64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN --build-arg OCELOT_GITHUB_API_KEY=$OCELOT_GITHUB_API_KEY --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
 # docker build --platform linux/amd64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN --build-arg OCELOT_GITHUB_API_KEY=$OCELOT_GITHUB_API_KEY --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
-FROM mijitt0m/ocelot-build:0.0.6
+FROM mijitt0m/ocelot-build:0.0.7
 
 ARG OCELOT_COVERALLS_TOKEN
 ARG OCELOT_NUTGET_API_KEY

diff --git a/docker/build.sh b/docker/build.sh
@@ -1,5 +1,5 @@
 # this script build the ocelot docker file
-version=0.0.6
+version=0.0.7
 docker build --platform linux/amd64 -t mijitt0m/ocelot-build -f Dockerfile.base .
 echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
 docker tag mijitt0m/ocelot-build mijitt0m/ocelot-build:$version

diff --git a/test/Ocelot.ManualTest/Ocelot.postman_collection.json b/test/Ocelot.ManualTest/Ocelot.postman_collection.json
@@ -1,7 +1,7 @@
 {
   "id": "4dbde9fe-89f5-be35-bb9f-d3b438e16375",
   "name": "Ocelot",
-  "description": string.Empty,
+  "description": "",
   "order": [
     "a1c95935-ed18-d5dc-bcb8-a3db8ba1934f",
     "ea0ed57a-2cb9-8acc-47dd-006b8db2f1b2",
@@ -29,8 +29,8 @@
       "data": null,
       "rawModeData": null,
       "descriptionFormat": "html",
-      "description": string.Empty,
-      "headers": string.Empty,
+      "description": "",
+      "headers": "",
       "method": "GET",
       "pathVariables": {},
       "url": "http://localhost:5000/comments?postId=1",
@@ -52,7 +52,7 @@
           "key": "Authorization",
           "value": "Bearer {{AccessToken}}",
           "enabled": true,
-          "description": string.Empty
+          "description": ""
         }
       ],
       "url": "http://localhost:5000/administration/configuration",
@@ -69,7 +69,7 @@
       "helperAttributes": "{}",
       "time": 1508849878025,
       "name": "GET http://localhost:5000/admin/configuration",
-      "description": string.Empty,
+      "description": "",
       "collectionId": "4dbde9fe-89f5-be35-bb9f-d3b438e16375",
       "responses": [],
       "isFromCollection": true,
@@ -79,7 +79,7 @@
     },
     {
       "id": "37bfa9f1-fe29-6a68-e558-66d125d2c96f",
-      "headers": string.Empty,
+      "headers": "",
       "headerData": [],
       "url": "http://localhost:5000/administration/connect/token",
       "folder": null,
@@ -132,7 +132,7 @@
       "helperAttributes": "{}",
       "time": 1506359585080,
       "name": "POST http://localhost:5000/admin/connect/token copy",
-      "description": string.Empty,
+      "description": "",
       "collectionId": "4dbde9fe-89f5-be35-bb9f-d3b438e16375",
       "responses": [],
       "isFromCollection": true,
@@ -148,8 +148,8 @@
       "data": null,
       "rawModeData": null,
       "descriptionFormat": "html",
-      "description": string.Empty,
-      "headers": string.Empty,
+      "description": "",
+      "headers": "",
       "method": "DELETE",
       "pathVariables": {},
       "url": "http://localhost:5000/posts/1",
@@ -170,7 +170,7 @@
         {
           "key": "Authorization",
           "value": "Bearer {{AccessToken}}",
-          "description": string.Empty,
+          "description": "",
           "enabled": true
         }
       ],
@@ -188,7 +188,7 @@
       "helperAttributes": {},
       "time": 1508849923518,
       "name": "GET http://localhost:5000/admin/.well-known/openid-configuration",
-      "description": string.Empty,
+      "description": "",
       "collectionId": "4dbde9fe-89f5-be35-bb9f-d3b438e16375",
       "responses": []
     },
@@ -237,8 +237,8 @@
       ],
       "rawModeData": null,
       "descriptionFormat": "html",
-      "description": string.Empty,
-      "headers": string.Empty,
+      "description": "",
+      "headers": "",
       "method": "POST",
       "pathVariables": {},
       "url": "http://localhost:5000/admin/configuration",
@@ -260,8 +260,8 @@
       "data": null,
       "rawModeData": null,
       "descriptionFormat": "html",
-      "description": string.Empty,
-      "headers": string.Empty,
+      "description": "",
+      "headers": "",
       "method": "GET",
       "pathVariables": {},
       "url": "http://localhost:5000/posts/1/comments",
@@ -283,8 +283,8 @@
       "data": [],
       "rawModeData": "{\n  \"title\": \"gfdgsgsdgsdfgsdfgdfg\",\n}",
       "descriptionFormat": "html",
-      "description": string.Empty,
-      "headers": string.Empty,
+      "description": "",
+      "headers": "",
       "method": "PATCH",
       "pathVariables": {},
       "url": "http://localhost:5000/posts/1",
@@ -306,8 +306,8 @@
       "data": [],
       "rawModeData": "{\n  \"userId\": 1,\n  \"title\": \"test\",\n  \"body\": \"test\"\n}",
       "descriptionFormat": "html",
-      "description": string.Empty,
-      "headers": string.Empty,
+      "description": "",
+      "headers": "",
       "method": "POST",
       "pathVariables": {},
       "url": "http://localhost:5000/posts",
@@ -329,8 +329,8 @@
       "data": null,
       "rawModeData": null,
       "descriptionFormat": "html",
-      "description": string.Empty,
-      "headers": string.Empty,
+      "description": "",
+      "headers": "",
       "method": "GET",
       "pathVariables": {},
       "url": "http://localhost:5000/posts/1",
@@ -352,8 +352,8 @@
       "data": [],
       "rawModeData": "{\n  \"userId\": 1,\n  \"title\": \"test\",\n  \"body\": \"test\"\n}",
       "descriptionFormat": "html",
-      "description": string.Empty,
-      "headers": string.Empty,
+      "description": "",
+      "headers": "",
       "method": "PUT",
       "pathVariables": {},
       "url": "http://localhost:5000/posts/1",
@@ -368,4 +368,4 @@
       "collectionId": "4dbde9fe-89f5-be35-bb9f-d3b438e16375"
     }
   ]
-}
+}
diff --git a/test/Ocelot.UnitTests/Configuration/Validation/RouteFluentValidatorTests.cs b/test/Ocelot.UnitTests/Configuration/Validation/RouteFluentValidatorTests.cs
@@ -2,23 +2,23 @@
 {
     using System;
     using System.Collections.Generic;
-    using System.Threading.Tasks;
-
-    using FluentValidation.Results;
-
+    using System.Threading.Tasks;
+
+    using FluentValidation.Results;
+
     using Microsoft.AspNetCore.Authentication;
-    using Microsoft.AspNetCore.Http;
-
-    using Moq;
-
+    using Microsoft.AspNetCore.Http;
+
+    using Moq;
+
     using Ocelot.Configuration.File;
     using Ocelot.Configuration.Validator;
-    using Ocelot.Requester;
-
-    using Shouldly;
-
-    using TestStack.BDDfy;
-
+    using Ocelot.Requester;
+
+    using Shouldly;
+
+    using TestStack.BDDfy;
+
     using Xunit;
 
     public class RouteFluentValidatorTests
@@ -346,7 +346,7 @@ public void should_be_valid_re_route_using_downstream_http_version(string versio
                 .BDDfy();
         }
 
-        [Theory(Skip = "Not work on non-english windows")]
+        [Theory]
         [InlineData("retg1.1")]
         [InlineData("re2.0")]
         [InlineData("1,0a")]