diff --git a/.github/workflows/hab-pkg-build-upload.yaml b/.github/workflows/hab-pkg-build-upload.yaml index 2a5fe67fa..b88228cad 100644 --- a/.github/workflows/hab-pkg-build-upload.yaml +++ b/.github/workflows/hab-pkg-build-upload.yaml @@ -169,45 +169,42 @@ jobs: compression-level: 0 overwrite: true - # # These particular components - # # - don't have a plan.sh file in their "component root" - # # - don't have a habitat plan directory - # # - have a habitat-dev plan directory - # # - don't have architecture specific plan directories - # habitat-dev-dir-packages: - # needs: [habitat-dir-packages, arch-target-packages] - # strategy: - # fail-fast: false - # matrix: - # os: [ubuntu-latest] - # channel: [unstable] - # components: [builder-jobsrv, builder-worker] - # # components: [builder-api, builder-api-proxy, builder-jobsrv, builder-worker] - # runs-on: ${{matrix.os}} - # steps: - - # - name: Checkout - # uses: actions/checkout@v4 - - # - name: Install Habitat - # uses: ./.github/actions/hab-install-linux - - # - name: Download HART file we need here previouisly built in "habitat-dir-components" job - # uses: actions/download-artifact@v3 - # with: - # name: hart-files - # path: /hab/cache/artifacts/ - - # - 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-dev - - -# JAH: rename arches + # These particular components + # - don't have a plan.sh file in their "component root" + # - don't have a habitat plan directory + # - have a habitat-dev plan directory + # - don't have architecture specific plan directories + habitat-dev-dir-packages: + needs: [habitat-dir-packages, arch-target-packages] + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest] + channel: [unstable] + components: [builder-jobsrv, builder-worker] + # components: [builder-api, builder-api-proxy, builder-jobsrv, builder-worker] + runs-on: ${{matrix.os}} + steps: + + - name: Checkout + uses: actions/checkout@v4 + + - name: Install Habitat + uses: ./.github/actions/hab-install-linux + + - name: Download HART file we need here previouisly built in "habitat-dir-components" job + uses: actions/download-artifact@v3 + with: + name: hart-files + path: /hab/cache/artifacts/ + + - 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-dev + # JAH: trigger appropriately # JAH: Set the hab_auth_token more appropriately # JAH: stop using jasonheath origin -