wip 1719931078

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

Hide file tree

Showing 3 changed files with 127 additions and 113 deletions.
diff --git a/.github/actions/hab-install-linux/action.yaml b/.github/actions/hab-install-linux/action.yaml
@@ -25,3 +25,14 @@ runs:
       run: |
         echo --- hab curl bash install of "$VERSION" for "$TARGET"
         curl "$URL" | sudo bash -s -- -v "$VERSION" -t "$TARGET"
+        echo --- installed hab
+
+        echo --- hab license accept
+        hab license accept
+        sudo hab license accept
+        echo --- accepted hab license
+
+        echo --- hab origin key download
+        hab origin key download --auth $HAB_AUTH_TOKEN --secret $HAB_ORIGIN
+        sudo hab origin key download --auth $HAB_AUTH_TOKEN --secret $HAB_ORIGIN
+        echo --- downloaded hab origin key
diff --git a/.github/actions/hab-pkg-build-and-upload-linux/action.yaml b/.github/actions/hab-pkg-build-and-upload-linux/action.yaml
@@ -26,24 +26,27 @@ runs:
       run: |
         export HAB_STUDIO_SECRET_GITHUB_TOKEN
 
-        hab license accept
-        hab origin key download $HAB_ORIGIN
-        hab origin key download --auth $HAB_AUTH_TOKEN --secret $HAB_ORIGIN
-
         echo "--- hab pkg build $BLDR_COMPONENT"
         hab pkg build $BLDR_COMPONENT
         echo "--- built succesfully"
 
         source results/last_build.env
 
-        sudo hab license accept
-        sudo hab origin key download $HAB_ORIGIN
-        sudo hab origin key download --auth $HAB_AUTH_TOKEN --secret $HAB_ORIGIN
-
         echo "--- sudo hab pkg install --auth elided-HAB_AUTH_TOKEN results/$pkg_artifact"
         sudo hab pkg install --auth $HAB_AUTH_TOKEN results/$pkg_artifact
         echo "--- installed succesfully"
 
+        echo "--- BEGIN hab pkg path EXPERIMENTS"
+        echo "--- hab pkg path $HAB_ORIGIN/$BLDR_COMPONENT"
+        hab pkg path $HAB_ORIGIN/$BLDR_COMPONENT
+        echo "--- hab pkg path $pkg_origin/$pkg_name"
+        hab pkg path $pkg_origin/$pkg_name
+        echo "--- hab pkg path $pkg_origin/$pkg_name/$pkg_release"
+        hab pkg path $pkg_origin/$pkg_name/$pkg_release
+        echo "--- hab pkg path $pkg_artifact"
+        hab pkg path $pkg_artifact
+        echo "--- END hab pkg path EXPERIMENTS"
+
         echo "--- hab pkg upload --auth elided-HAB_AUTH_TOKEN results/$pkg_artifact"
         hab pkg upload --auth $HAB_AUTH_TOKEN results/$pkg_artifact
         echo "--- uploaded succesfully"
diff --git a/.github/workflows/hab-pkg-build-upload.yaml b/.github/workflows/hab-pkg-build-upload.yaml
@@ -23,111 +23,111 @@ permissions:
 
 jobs:
 
-  # In their component root, these particular components
-  # - have a plan.sh file
-  # - don't have a habitat plan directory
-  # - don't have a habitat-dev plan directory
-  # - don't have architecture specific plan directories
-  plan-file-packages:
-    name: ${{matrix.components}} (plan file)
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        channel: [unstable]
-        components: [builder-memcached, builder-datastore]
-    runs-on: ${{matrix.os}}
-    steps:
-      - name: Checkout for ${{matrix.components}}
-        uses: actions/checkout@v4
-      - name: Install Habitat for ${{matrix.components}}
-        uses: ./.github/actions/hab-install-linux
-      - name: Build and Upload Habitat Package for ${{matrix.components}}
-        uses: ./.github/actions/hab-pkg-build-and-upload-linux
-        with:
-          hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
-          hab-origin: ${{ env.HAB_ORIGIN }}
-          bldr-component: components/${{matrix.components}}
-
-  # In their component root, these particular components
-  # - don't have a plan.sh file
-  # - have a habitat plan directory
-  # - don't have a habitat-dev plan directory
-  # - don't have architecture specific plan directories
-  habitat-dir-packages:
-    name: ${{matrix.components}} (habitat dir only)
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        channel: [unstable]
-        components: [builder-graph, builder-minio]
-    runs-on: ${{matrix.os}}
-    steps:
-
-      - name: Checkout for ${{matrix.components}}
-        uses: actions/checkout@v4
-
-      - name: Install Habitat for ${{matrix.components}}
-        uses: ./.github/actions/hab-install-linux
-
-      - name: Build and Upload Habitat Package for ${{matrix.components}}
-        uses: ./.github/actions/hab-pkg-build-and-upload-linux
-        with:
-          hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
-          hab-origin: ${{ env.HAB_ORIGIN }}
-          bldr-component: components/${{matrix.components}}/habitat
-
-  # In their component root, these particular components
-  # - don't have a plan.sh file
-  # - don't have a habitat plan directory
-  # - don't have a habitat-dev plan directory
-  # - have architecture specific plan directories
-  arch-target-packages:
-    name: ${{matrix.arches}} ${{matrix.components}}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-        channel: [unstable]
-        components: [builder-worker]
-        arches: [x86_64-linux, x86_64-linux-kernel2, x86_64-windows]
-        exclude:
-          - os: ubuntu-latest
-            arches: x86_64-windows
-          - os: windows-latest
-            arches: x86_64-linux
-          - os: windows-latest
-            arches: x86_64-linux-kernel2
-    runs-on: ${{matrix.os}}
-    steps:
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - if: ${{ matrix.os == 'ubuntu-latest'  && matrix.arches != 'x86_64-windows' }}
-        name: Install Habitat
-        uses: ./.github/actions/hab-install-linux
-      - if: ${{ matrix.os == 'windows-latest' && matrix.arches == 'x86_64-windows' }}
-        name: Install Habitat
-        uses: ./.github/actions/hab-install-windows
-
-      - if: ${{ matrix.os == 'ubuntu-latest'  && matrix.arches != 'x86_64-windows' }}
-        name: Build and Upload Habitat Package
-        uses: ./.github/actions/hab-pkg-build-and-upload-linux
-        with:
-          hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
-          hab-origin: ${{ env.HAB_ORIGIN }}
-          bldr-component: components/${{matrix.components}}/habitat/${{matrix.arches}}
-      - if: ${{ matrix.os == 'windows-latest' && matrix.arches == 'x86_64-windows' }}
-        name: Build and Upload Habitat Package
-        uses: ./.github/actions/hab-pkg-build-and-upload-windows
-        with:
-          hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
-          hab-origin: ${{ env.HAB_ORIGIN }}
-          bldr-component: components/${{matrix.components}}/habitat/${{matrix.arches}}
-          app-version: ${{ needs.pre-build.outputs.app_version }}
-          build-date-time: ${{ needs.pre-build.outputs.date }}
+  # # In their component root, these particular components
+  # # - have a plan.sh file
+  # # - don't have a habitat plan directory
+  # # - don't have a habitat-dev plan directory
+  # # - don't have architecture specific plan directories
+  # plan-file-packages:
+  #   name: ${{matrix.components}} (plan file)
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       os: [ubuntu-latest]
+  #       channel: [unstable]
+  #       components: [builder-memcached, builder-datastore]
+  #   runs-on: ${{matrix.os}}
+  #   steps:
+  #     - name: Checkout for ${{matrix.components}}
+  #       uses: actions/checkout@v4
+  #     - name: Install Habitat for ${{matrix.components}}
+  #       uses: ./.github/actions/hab-install-linux
+  #     - name: Build and Upload Habitat Package for ${{matrix.components}}
+  #       uses: ./.github/actions/hab-pkg-build-and-upload-linux
+  #       with:
+  #         hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
+  #         hab-origin: ${{ env.HAB_ORIGIN }}
+  #         bldr-component: components/${{matrix.components}}
+
+  # # In their component root, these particular components
+  # # - don't have a plan.sh file
+  # # - have a habitat plan directory
+  # # - don't have a habitat-dev plan directory
+  # # - don't have architecture specific plan directories
+  # habitat-dir-packages:
+  #   name: ${{matrix.components}} (habitat dir only)
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       os: [ubuntu-latest]
+  #       channel: [unstable]
+  #       components: [builder-graph, builder-minio]
+  #   runs-on: ${{matrix.os}}
+  #   steps:
+
+  #     - name: Checkout for ${{matrix.components}}
+  #       uses: actions/checkout@v4
+
+  #     - name: Install Habitat for ${{matrix.components}}
+  #       uses: ./.github/actions/hab-install-linux
+
+  #     - name: Build and Upload Habitat Package for ${{matrix.components}}
+  #       uses: ./.github/actions/hab-pkg-build-and-upload-linux
+  #       with:
+  #         hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
+  #         hab-origin: ${{ env.HAB_ORIGIN }}
+  #         bldr-component: components/${{matrix.components}}/habitat
+
+  # # In their component root, these particular components
+  # # - don't have a plan.sh file
+  # # - don't have a habitat plan directory
+  # # - don't have a habitat-dev plan directory
+  # # - have architecture specific plan directories
+  # arch-target-packages:
+  #   name: ${{matrix.arches}} ${{matrix.components}}
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       os: [ubuntu-latest, windows-latest]
+  #       channel: [unstable]
+  #       components: [builder-worker]
+  #       arches: [x86_64-linux, x86_64-linux-kernel2, x86_64-windows]
+  #       exclude:
+  #         - os: ubuntu-latest
+  #           arches: x86_64-windows
+  #         - os: windows-latest
+  #           arches: x86_64-linux
+  #         - os: windows-latest
+  #           arches: x86_64-linux-kernel2
+  #   runs-on: ${{matrix.os}}
+  #   steps:
+
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+
+  #     - if: ${{ matrix.os == 'ubuntu-latest'  && matrix.arches != 'x86_64-windows' }}
+  #       name: Install Habitat
+  #       uses: ./.github/actions/hab-install-linux
+  #     - if: ${{ matrix.os == 'windows-latest' && matrix.arches == 'x86_64-windows' }}
+  #       name: Install Habitat
+  #       uses: ./.github/actions/hab-install-windows
+
+  #     - if: ${{ matrix.os == 'ubuntu-latest'  && matrix.arches != 'x86_64-windows' }}
+  #       name: Build and Upload Habitat Package
+  #       uses: ./.github/actions/hab-pkg-build-and-upload-linux
+  #       with:
+  #         hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
+  #         hab-origin: ${{ env.HAB_ORIGIN }}
+  #         bldr-component: components/${{matrix.components}}/habitat/${{matrix.arches}}
+  #     - if: ${{ matrix.os == 'windows-latest' && matrix.arches == 'x86_64-windows' }}
+  #       name: Build and Upload Habitat Package
+  #       uses: ./.github/actions/hab-pkg-build-and-upload-windows
+  #       with:
+  #         hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
+  #         hab-origin: ${{ env.HAB_ORIGIN }}
+  #         bldr-component: components/${{matrix.components}}/habitat/${{matrix.arches}}
+  #         app-version: ${{ needs.pre-build.outputs.app_version }}
+  #         build-date-time: ${{ needs.pre-build.outputs.date }}
 
   # In their component root, these particular components
   # - don't have a plan.sh file