fixing ubuntu variables

brightdigit · Jul 30, 2024 · c9cbc1d · c9cbc1d
1 parent ebd379b
commit c9cbc1d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 64 deletions.
diff --git a/.github/workflows/Ngrokit.yml b/.github/workflows/Ngrokit.yml
@@ -21,23 +21,17 @@ jobs:
       image: swiftlang/swift:nightly-6.0-jammy
     steps:
       - uses: actions/checkout@v4
-      - name: Set Ubuntu Release DOT
-        run: echo "RELEASE_DOT=$(lsb_release -sr)" >> $GITHUB_ENV
-      - name: Set Ubuntu Release NUM
-        run: echo "RELEASE_NUM=${RELEASE_DOT//[-._]/}"  >> $GITHUB_ENV
-      - name: Set Ubuntu Codename
-        run: echo "RELEASE_NAME=$(lsb_release -sc)"  >> $GITHUB_ENV
       - name: Cache swift package modules
         id: cache-spm-linux
         uses: actions/cache@v4
         env:
           cache-name: cache-spm
         with:
           path: .build
-          key: ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
           restore-keys: |
-            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
-            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
+            ${{ runner.os }}-${{ env.cache-name }}-
       - name: Test
         run: swift test --enable-code-coverage 
       - uses: sersoft-gmbh/swift-coverage-action@v4
@@ -48,7 +42,7 @@ jobs:
         uses: codecov/codecov-action@v4       
         with:
           fail_ci_if_error: true
-          flags: swift-${{ matrix.swift-version }},ubuntu-${{ matrix.RELEASE_DOT }}
+          flags: swift-${{ matrix.swift-version }},ubuntu
           verbose: true        
           token: ${{ secrets.CODECOV_TOKEN }}  
           files: ${{ join(fromJSON(steps.coverage-files.outputs.files), ',') }}        

diff --git a/.github/workflows/Sublimation.yml b/.github/workflows/Sublimation.yml
@@ -16,23 +16,17 @@ jobs:
       image: swiftlang/swift:nightly-6.0-jammy
     steps:
       - uses: actions/checkout@v4
-      - name: Set Ubuntu Release DOT
-        run: echo "RELEASE_DOT=$(lsb_release -sr)" >> $GITHUB_ENV
-      - name: Set Ubuntu Release NUM
-        run: echo "RELEASE_NUM=${RELEASE_DOT//[-._]/}"  >> $GITHUB_ENV
-      - name: Set Ubuntu Codename
-        run: echo "RELEASE_NAME=$(lsb_release -sc)"  >> $GITHUB_ENV
       - name: Cache swift package modules
         id: cache-spm-linux
         uses: actions/cache@v4
         env:
           cache-name: cache-spm
         with:
           path: .build
-          key: ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
           restore-keys: |
-            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
-            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
+            ${{ runner.os }}-${{ env.cache-name }}-
       - name: Test
         run: swift test --enable-code-coverage 
       - uses: sersoft-gmbh/swift-coverage-action@v4
@@ -43,10 +37,10 @@ jobs:
         uses: codecov/codecov-action@v4       
         with:
           fail_ci_if_error: true
-          flags: swift-${{ matrix.swift-version }},ubuntu-${{ matrix.RELEASE_DOT }}
+          flags: swift-${{ matrix.swift-version }},ubuntu
           verbose: true        
           token: ${{ secrets.CODECOV_TOKEN }}  
-          files: ${{ join(fromJSON(steps.coverage-files.outputs.files), ',') }}        
+          files: ${{ join(fromJSON(steps.coverage-files.outputs.files), ',') }}    
   build-macos:
     name: Build on macOS
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/SublimationBonjour.yml b/.github/workflows/SublimationBonjour.yml
@@ -21,23 +21,17 @@ jobs:
       image: swiftlang/swift:nightly-6.0-jammy
     steps:
       - uses: actions/checkout@v4
-      - name: Set Ubuntu Release DOT
-        run: echo "RELEASE_DOT=$(lsb_release -sr)" >> $GITHUB_ENV
-      - name: Set Ubuntu Release NUM
-        run: echo "RELEASE_NUM=${RELEASE_DOT//[-._]/}"  >> $GITHUB_ENV
-      - name: Set Ubuntu Codename
-        run: echo "RELEASE_NAME=$(lsb_release -sc)"  >> $GITHUB_ENV
       - name: Cache swift package modules
         id: cache-spm-linux
         uses: actions/cache@v4
         env:
           cache-name: cache-spm
         with:
           path: .build
-          key: ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
           restore-keys: |
-            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
-            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
+            ${{ runner.os }}-${{ env.cache-name }}-
       - name: Test
         run: swift test --enable-code-coverage 
       - uses: sersoft-gmbh/swift-coverage-action@v4
@@ -48,10 +42,10 @@ jobs:
         uses: codecov/codecov-action@v4       
         with:
           fail_ci_if_error: true
-          flags: swift-${{ matrix.swift-version }},ubuntu-${{ matrix.RELEASE_DOT }}
+          flags: swift-${{ matrix.swift-version }},ubuntu
           verbose: true        
           token: ${{ secrets.CODECOV_TOKEN }}  
-          files: ${{ join(fromJSON(steps.coverage-files.outputs.files), ',') }}        
+          files: ${{ join(fromJSON(steps.coverage-files.outputs.files), ',') }}         
   build-macos:
     name: Build on macOS
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/SublimationNgrok.yml b/.github/workflows/SublimationNgrok.yml
@@ -21,23 +21,17 @@ jobs:
       image: swiftlang/swift:nightly-6.0-jammy
     steps:
       - uses: actions/checkout@v4
-      - name: Set Ubuntu Release DOT
-        run: echo "RELEASE_DOT=$(lsb_release -sr)" >> $GITHUB_ENV
-      - name: Set Ubuntu Release NUM
-        run: echo "RELEASE_NUM=${RELEASE_DOT//[-._]/}"  >> $GITHUB_ENV
-      - name: Set Ubuntu Codename
-        run: echo "RELEASE_NAME=$(lsb_release -sc)"  >> $GITHUB_ENV
       - name: Cache swift package modules
         id: cache-spm-linux
         uses: actions/cache@v4
         env:
           cache-name: cache-spm
         with:
           path: .build
-          key: ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
           restore-keys: |
-            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
-            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
+            ${{ runner.os }}-${{ env.cache-name }}-
       - name: Test
         run: swift test --enable-code-coverage 
       - uses: sersoft-gmbh/swift-coverage-action@v4
@@ -48,7 +42,7 @@ jobs:
         uses: codecov/codecov-action@v4       
         with:
           fail_ci_if_error: true
-          flags: swift-${{ matrix.swift-version }},ubuntu-${{ matrix.RELEASE_DOT }}
+          flags: swift-${{ matrix.swift-version }},ubuntu
           verbose: true        
           token: ${{ secrets.CODECOV_TOKEN }}  
           files: ${{ join(fromJSON(steps.coverage-files.outputs.files), ',') }}        

diff --git a/.github/workflows/SublimationService.yml b/.github/workflows/SublimationService.yml
@@ -21,23 +21,17 @@ jobs:
       image: swiftlang/swift:nightly-6.0-jammy
     steps:
       - uses: actions/checkout@v4
-      - name: Set Ubuntu Release DOT
-        run: echo "RELEASE_DOT=$(lsb_release -sr)" >> $GITHUB_ENV
-      - name: Set Ubuntu Release NUM
-        run: echo "RELEASE_NUM=${RELEASE_DOT//[-._]/}"  >> $GITHUB_ENV
-      - name: Set Ubuntu Codename
-        run: echo "RELEASE_NAME=$(lsb_release -sc)"  >> $GITHUB_ENV
       - name: Cache swift package modules
         id: cache-spm-linux
         uses: actions/cache@v4
         env:
           cache-name: cache-spm
         with:
           path: .build
-          key: ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
           restore-keys: |
-            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
-            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
+            ${{ runner.os }}-${{ env.cache-name }}-
       - name: Test
         run: swift test --enable-code-coverage 
       - uses: sersoft-gmbh/swift-coverage-action@v4
@@ -48,10 +42,10 @@ jobs:
         uses: codecov/codecov-action@v4       
         with:
           fail_ci_if_error: true
-          flags: swift-${{ matrix.swift-version }},ubuntu-${{ matrix.RELEASE_DOT }}
+          flags: swift-${{ matrix.swift-version }},ubuntu
           verbose: true        
           token: ${{ secrets.CODECOV_TOKEN }}  
-          files: ${{ join(fromJSON(steps.coverage-files.outputs.files), ',') }}        
+          files: ${{ join(fromJSON(steps.coverage-files.outputs.files), ',') }}  
   build-macos:
     name: Build on macOS
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/SublimationVapor.yml b/.github/workflows/SublimationVapor.yml
@@ -20,23 +20,17 @@ jobs:
       image: swiftlang/swift:nightly-6.0-jammy
     steps:
       - uses: actions/checkout@v4
-      - name: Set Ubuntu Release DOT
-        run: echo "RELEASE_DOT=$(lsb_release -sr)" >> $GITHUB_ENV
-      - name: Set Ubuntu Release NUM
-        run: echo "RELEASE_NUM=${RELEASE_DOT//[-._]/}"  >> $GITHUB_ENV
-      - name: Set Ubuntu Codename
-        run: echo "RELEASE_NAME=$(lsb_release -sc)"  >> $GITHUB_ENV
       - name: Cache swift package modules
         id: cache-spm-linux
         uses: actions/cache@v4
         env:
           cache-name: cache-spm
         with:
           path: .build
-          key: ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
           restore-keys: |
-            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
-            ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
+            ${{ runner.os }}-${{ env.cache-name }}-
       - name: Test
         run: swift test --enable-code-coverage 
       - uses: sersoft-gmbh/swift-coverage-action@v4
@@ -47,10 +41,10 @@ jobs:
         uses: codecov/codecov-action@v4       
         with:
           fail_ci_if_error: true
-          flags: swift-${{ matrix.swift-version }},ubuntu-${{ matrix.RELEASE_DOT }}
+          flags: swift-${{ matrix.swift-version }},ubuntu
           verbose: true        
           token: ${{ secrets.CODECOV_TOKEN }}  
-          files: ${{ join(fromJSON(steps.coverage-files.outputs.files), ',') }}        
+          files: ${{ join(fromJSON(steps.coverage-files.outputs.files), ',') }}      
   build-macos:
     name: Build on macOS
     runs-on: ${{ matrix.os }}