Merge branch 'NethermindEth:main' into feature/NethermindEth#41-impro…

…ve_logging_in_ping
chertby · Oct 17, 2023 · 45eb335 · 45eb335
2 parents 3947417 + 8ff1cdf
commit 45eb335
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -18,8 +18,6 @@ jobs:
 
       - name: Set up .NET
         uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: 7
 
       - name: Format whitespace
         working-directory: ${{ env.WORKING_DIR }}

diff --git a/.github/workflows/pubish.yml → .github/workflows/publish.yml b/.github/workflows/pubish.yml → .github/workflows/publish.yml
@@ -28,8 +28,6 @@ jobs:
 
       - name: Set up .NET
         uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: 7
 
       - name: Install dependencies
         working-directory: ${{ env.WORKING_DIR }}
@@ -39,7 +37,6 @@ jobs:
         working-directory: ${{ env.WORKING_DIR }}
         run: |
           dotnet build -c ${{ env.BUILD_CONFIG }} --no-restore \
-            -p:ContinuousIntegrationBuild=true \
             -p:Commit=${{ github.sha }} \
             -p:VersionSuffix=preview.${{ github.run_number }}
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,6 +2,8 @@ name: Test
 
 on:
   pull_request:
+  push:
+    branches: [main]
 
 jobs:
   test:
@@ -19,16 +21,14 @@ jobs:
 
       - name: Set up .NET
         uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: 7
 
       - name: Install dependencies
         working-directory: ${{ env.WORKING_DIR }}
         run: dotnet restore
 
       - name: Build
         working-directory: ${{ env.WORKING_DIR }}
-        run: dotnet build -c ${{ env.BUILD_CONFIG }} --no-restore -p:ContinuousIntegrationBuild=true -p:Commit=${{ github.sha }}
+        run: dotnet build -c ${{ env.BUILD_CONFIG }} --no-restore -p:Commit=${{ github.sha }}
 
       - name: Test
         working-directory: ${{ env.WORKING_DIR }}

diff --git a/global.json b/global.json
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "7.0.0",
+    "allowPrerelease": false,
+    "rollForward": "latestFeature"
+  }
+}
diff --git a/src/libp2p/Directory.Build.props b/src/libp2p/Directory.Build.props
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
   <PropertyGroup Label="ProductInfo">