wip 1719921961

Signed-off-by: Jason Heath <[email protected]>
habitat-sh · Jul 2, 2024 · ed1ef15 · ed1ef15
1 parent 9455205
commit ed1ef15
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/.github/actions/hab-pkg-build-and-upload-windows/action.yaml b/.github/actions/hab-pkg-build-and-upload-windows/action.yaml
@@ -29,7 +29,7 @@ runs:
         BUILD_DATE_TIME: ${{ inputs.build-date-time}}
       run: |
 
-        $env:BUILD_ARGS = "-X 'main.git_sha=${{ github.sha }}' -X 'main.version=$env:APP_VERSION' -X 'main.build_date_time=$env:BUILD_DATE_TIME'"
+        # $env:BUILD_ARGS = "-X 'main.git_sha=${{ github.sha }}' -X 'main.version=$env:APP_VERSION' -X 'main.build_date_time=$env:BUILD_DATE_TIME'"
         $env:Path += ";C:\ProgramData\Habitat"
 
         hab license accept

diff --git a/.github/workflows/hab-pkg-build-upload.yaml b/.github/workflows/hab-pkg-build-upload.yaml
@@ -23,24 +23,20 @@ permissions:
 
 jobs:
 
-  windows-pre-build:
-    runs-on: ubuntu-latest
-    outputs:
-      app_version: ${{ steps.app_version.outputs.APP_VERSION }}
-      date: ${{ steps.date.outputs.DATE }}
-    steps:
-      - name: Get branch name
-        id: get_branch_name
-        run: |
-          echo "BRANCH_NAME=${GITHUB_REF_NAME//\//-}" >> "$GITHUB_OUTPUT"
-      - name: Get formated date
-        id: date
-        run: |
-          echo "DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> "$GITHUB_OUTPUT"
-      - name: Get version from tag
-        id: app_version
-        run: |
-           echo "APP_VERSION=$(git describe --tags `git rev-list --tags --max-count=1` | sed 's/^v//')" >> "$GITHUB_OUTPUT"
+  # windows-pre-build:
+  #   runs-on: ubuntu-latest
+  #   outputs:
+  #     app_version: ${{ steps.app_version.outputs.APP_VERSION }}
+  #     date: ${{ steps.date.outputs.DATE }}
+  #   steps:
+  #     - name: Get formated date
+  #       id: date
+  #       run: |
+  #         echo "DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> "$GITHUB_OUTPUT"
+  #     - name: Get version from tag
+  #       id: app_version
+  #       run: |
+  #          echo "APP_VERSION=$(git describe --tags `git rev-list --tags --max-count=1` | sed 's/^v//')" >> "$GITHUB_OUTPUT"
 
   # These particular components
   # - have a plan.sh file in their "component root"
@@ -115,7 +111,7 @@ jobs:
   # - have architecture specific plan directories
   arch-target-packages:
     name: ${{matrix.arches}} ${{matrix.components}} hab pkg (plan file)
-    needs: windows-pre-build
+    # needs: windows-pre-build
     strategy:
       fail-fast: false
       matrix: