diff --git a/.github/workflows/wf_build_artifacts.yaml b/.github/workflows/wf_build_artifacts.yaml index bc5cac1a..8d374db5 100644 --- a/.github/workflows/wf_build_artifacts.yaml +++ b/.github/workflows/wf_build_artifacts.yaml @@ -57,22 +57,11 @@ jobs: diagnostic-endpoint: "" use-flakehub: false - - name: "Verify if we need to build" - id: verify-build - run: | - export drvPath=$(make check-dry-run) - echo "drvPath - $drvPath" - nix store verify --no-trust --store http://127.0.0.1:37515 $drvPath \ - && export BUILD_NEEDED=no \ - || export BUILD_NEEDED=yes - - echo BUILD_NEEDED=$BUILD_NEEDED >> $GITHUB_OUTPUT - echo DERIVATION_PATH=$drvPath >> $GITHUB_OUTPUT - - name: Compute common env vars id: vars run: | echo "VERSION=$(make get-version VER=${{ inputs.VERSION }})" >> $GITHUB_OUTPUT + echo "ARCHITECTURE=$(uname -m)" >> $GITHUB_OUTPUT - name: "Build artifact" run: | @@ -82,7 +71,7 @@ jobs: - name: "Push artifact to artifact repository" uses: actions/upload-artifact@v4 with: - name: ${{ inputs.NAME }}-artifact-${{ matrix.os }}-${{ steps.vars.outputs.VERSION }} + name: ${{ inputs.NAME }}-artifact-${{ steps.vars.outputs.ARCHITECTURE }}-${{ steps.vars.outputs.VERSION }} path: result/bin/hasura-storage retention-days: 7 @@ -94,7 +83,7 @@ jobs: - name: "Push docker image to artifact repository" uses: actions/upload-artifact@v4 with: - name: ${{ inputs.NAME }}-docker-image-${{ matrix.os }}-${{ steps.vars.outputs.VERSION }} + name: ${{ inputs.NAME }}-docker-image-${{ steps.vars.outputs.ARCHITECTURE }}-${{ steps.vars.outputs.VERSION }} path: result retention-days: 7 if: ${{ ( inputs.DOCKER ) }} @@ -103,4 +92,3 @@ jobs: # run: | # # DEPENDENCIES=($(nix-store --query --requisites --include-outputs ${{ steps.verify-build.outputs.DERIVATION_PATH }})) # nix copy --to http://127.0.0.1:37515 "${DEPENDENCIES[@]}" || exit 0 - # if: ${{ steps.verify-build.outputs.BUILD_NEEDED == 'yes' }} diff --git a/Makefile b/Makefile index 887b5cb9..84f6f82d 100644 --- a/Makefile +++ b/Makefile @@ -72,10 +72,8 @@ build: ## Build application and places the binary under ./result/bin .PHONY: build-dry-run build-dry-run: ## Run nix flake check - nix build \ - --dry-run \ - --json \ - --print-build-logs \ + @nix path-info \ + --derivation \ .\#packages.$(ARCH)-$(OS).default