remove static and build workflow inputs

microsoft · Apr 17, 2024 · 0cdab67 · 0cdab67
1 parent c411676
commit 0cdab67
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 41 deletions.
diff --git a/.github/workflows/build-reuse-unix.yml b/.github/workflows/build-reuse-unix.yml
@@ -42,18 +42,10 @@ on:
         #   - x64
         #   - arm
         #   - arm64
-      static:
-        required: false
-        default: ''
-        type: string
       clang:
         required: false
         default: ''
         type: string
-      build:
-        required: false
-        default: '' # Empty string means build all
-        type: string
 
 permissions: read-all
 
@@ -78,11 +70,10 @@ jobs:
       shell: pwsh
       run: scripts/prepare-machine.ps1 -ForBuild
     - name: Build
-      if: inputs.build == ''
       shell: pwsh
-      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} ${{ inputs.static }} ${{ inputs.clang }} -OneBranch
+      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} ${{ inputs.clang }} -OneBranch
     - name: Upload build artifacts
       uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
       with:
-        name: ${{ inputs.config }}-${{ inputs.plat }}-${{ inputs.os }}-${{ inputs.arch }}-${{ inputs.static }}${{ inputs.clang }}${{ inputs.build }}
+        name: ${{ inputs.config }}-${{ inputs.plat }}-${{ inputs.os }}-${{ inputs.arch }}-${{ inputs.clang }}
         path: artifacts
diff --git a/.github/workflows/build-reuse-win.yml b/.github/workflows/build-reuse-win.yml
@@ -39,14 +39,6 @@ on:
         #   - x86
         #   - x64
         #   - arm64
-      static:
-        required: false
-        default: ''
-        type: string
-      build:
-        required: false
-        default: '' # Empty string means build all
-        type: string
 
 permissions: read-all
 
@@ -65,11 +57,10 @@ jobs:
       shell: pwsh
       run: scripts/prepare-machine.ps1 -ForBuild
     - name: Build
-      if: inputs.build == ''
       shell: pwsh
-      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} ${{ inputs.static }}
+      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }}
     - name: Upload build artifacts
       uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
       with:
-        name: ${{ inputs.config }}-${{ inputs.plat }}-${{ inputs.os }}-${{ inputs.arch }}-${{ inputs.static }}${{ inputs.build }}
+        name: ${{ inputs.config }}-${{ inputs.plat }}-${{ inputs.os }}-${{ inputs.arch }}
         path: artifacts
diff --git a/.github/workflows/build-reuse-winkernel.yml b/.github/workflows/build-reuse-winkernel.yml
@@ -37,10 +37,6 @@ on:
         #   - x86
         #   - x64
         #   - arm64
-      build:
-        required: false
-        default: '' # Empty string means build all
-        type: string
 
 permissions: read-all
 
@@ -60,11 +56,10 @@ jobs:
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce
     - name: Build
-      if: inputs.build == ''
       shell: pwsh
       run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }}
     - name: Upload build artifacts
       uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
       with:
-        name: ${{ inputs.config }}-${{ inputs.plat }}-${{ inputs.os }}-${{ inputs.arch }}-${{ inputs.build }}
+        name: ${{ inputs.config }}-${{ inputs.plat }}-${{ inputs.os }}-${{ inputs.arch }}
         path: artifacts
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,21 +27,15 @@ jobs:
       fail-fast: false
       matrix:
         config: ['Debug', 'Release']
-        plat: [windows, uwp] # TODO: Support gamecore_console
+        plat: [windows] # TODO: Support uwp, gamecore_console
         os: ['windows-2022']
         arch: [x86, x64, arm64]
-        static: ['', '-Static']
-        exclude:
-        # TODO: FIX: Static builds fail with UWP
-        - plat: uwp
-          static: '-Static'
     uses: ./.github/workflows/build-reuse-win.yml
     with:
       config: ${{ matrix.config }}
       plat: ${{ matrix.plat }}
       os: ${{ matrix.os }}
       arch: ${{ matrix.arch }}
-      static: ${{ matrix.static }}
 
   build-windows-kernel:
     name: WinKernel
@@ -70,14 +64,12 @@ jobs:
         plat: [linux]
         os: ['ubuntu-20.04', 'ubuntu-22.04']
         arch: [arm, arm64]
-        static: ['', '-Static']
     uses: ./.github/workflows/build-reuse-unix.yml
     with:
       config: ${{ matrix.config }}
       plat: ${{ matrix.plat }}
       os: ${{ matrix.os }}
       arch: ${{ matrix.arch }}
-      static: ${{ matrix.static }}
 
   build-ubuntu:
     name: Ubuntu
@@ -89,7 +81,6 @@ jobs:
         plat: [linux, android]
         os: ['ubuntu-20.04', 'ubuntu-22.04']
         arch: [x86, x64]
-        static: ['', '-Static']
         clang: ['', '-Clang']
         exclude:
         # Android doesn't support x86
@@ -104,7 +95,6 @@ jobs:
       plat: ${{ matrix.plat }}
       os: ${{ matrix.os }}
       arch: ${{ matrix.arch }}
-      static: ${{ matrix.static }}
       clang: ${{ matrix.clang }}
 
   build-darwin:
@@ -117,11 +107,9 @@ jobs:
         plat: [macos, ios]
         os: ['macos-12']
         arch: [x64, arm64]
-        static: ['', '-Static']
     uses: ./.github/workflows/build-reuse-unix.yml
     with:
       config: ${{ matrix.config }}
       plat: ${{ matrix.plat }}
       os: ${{ matrix.os }}
       arch: ${{ matrix.arch }}
-      static: ${{ matrix.static }}