diff --git a/.github/workflows/build-ddev.yml b/.github/workflows/build-ddev.yml index 44b99d3439c4b..53f45310f7cdc 100644 --- a/.github/workflows/build-ddev.yml +++ b/.github/workflows/build-ddev.yml @@ -45,7 +45,7 @@ jobs: run: python -m build - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: python-artifacts path: ddev/dist/* @@ -142,7 +142,7 @@ jobs: - name: Download Python artifacts if: ${{ !startsWith(github.event.ref, 'refs/tags') }} - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: python-artifacts path: ddev/dist @@ -214,9 +214,9 @@ jobs: - name: Upload staged managed archive if: runner.os != 'Linux' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: staged-managed-${{ runner.os }} + name: staged-managed-${{ runner.os }}-${{ matrix.job.target }} path: ddev/packaging/* if-no-files-found: error @@ -235,9 +235,9 @@ jobs: - name: Upload staged standalone archive if: runner.os != 'Linux' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: staged-standalone-${{ runner.os }} + name: staged-standalone-${{ runner.os }}-${{ matrix.job.target }} path: ddev/packaging/* if-no-files-found: error @@ -245,9 +245,9 @@ jobs: # can upload directly at this point - name: Upload standalone archive if: runner.os == 'Linux' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: standalone + name: standalone-${{ matrix.job.target }} path: ddev/packaging/* if-no-files-found: error @@ -304,10 +304,11 @@ jobs: OUTER - name: Download staged standalone binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: staged-standalone-${{ runner.os }} + pattern: staged-standalone-${{ runner.os }}-* path: ddev/archives + merge-multiple: true - name: Extract staged standalone binaries run: ${{ steps.script-extract.outputs.script }} @@ -316,7 +317,7 @@ jobs: run: ${{ steps.script-prepare.outputs.script }} - name: Upload standalone binaries - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: standalone path: ddev/archives/* @@ -326,10 +327,11 @@ jobs: run: rm -rf archives bin targets - name: Download staged managed binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: staged-managed-${{ runner.os }} + pattern: staged-managed-${{ runner.os }}-* path: ddev/archives + merge-multiple: true - name: Extract staged managed binaries run: ${{ steps.script-extract.outputs.script }} @@ -349,10 +351,11 @@ jobs: mv build/*/release/*/*.{exe,msi} installers - name: Upload installers - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: installers + name: installers-${{ runner.os }} path: ddev/installers/* + if-no-files-found: error macos-packaging: name: Build macOS installer and sign/notarize artifacts @@ -375,36 +378,14 @@ jobs: - name: Install PyOxidizer ${{ env.PYOXIDIZER_VERSION }} run: pip install pyoxidizer==${{ env.PYOXIDIZER_VERSION }} - # TODO: Use the next official release after 0.22.0 by removing these 2 blocks, uncommenting - # the following one, and changing the artifact name to reflect the next version. See: - # https://github.com/indygreg/apple-platform-rs/issues/82 - # - # We use the artifact from the latest scheduled nightly job because installing - # with Cargo from scratch takes ~10 minutes - name: Install rcodesign - uses: dawidd6/action-download-artifact@v2 - with: - repo: indygreg/apple-platform-rs - workflow: rcodesign.yml - event: schedule - workflow_conclusion: success - name: exe-rcodesign-x86_64-apple-darwin - path: /usr/local/bin - search_artifacts: true - check_artifacts: true - github_token: ${{ secrets.GITHUB_TOKEN }} - - - name: Finalize rcodesign - run: chmod +x /usr/local/bin/rcodesign - - # - name: Install rcodesign - # env: - # ARCHIVE_NAME: "apple-codesign-0.22.0-x86_64-apple-darwin" - # run: >- - # curl -L - # "https://github.com/indygreg/apple-platform-rs/releases/download/apple-codesign%2F0.22.0/$ARCHIVE_NAME.tar.gz" - # | - # tar --strip-components=1 -xzf - -C /usr/local/bin "$ARCHIVE_NAME/rcodesign" + env: + ARCHIVE_NAME: "apple-codesign-0.27.0-x86_64-apple-darwin" + run: >- + curl -L + "https://github.com/indygreg/apple-platform-rs/releases/download/apple-codesign%2F0.27.0/$ARCHIVE_NAME.tar.gz" + | + tar --strip-components=1 -xzf - -C /usr/local/bin "$ARCHIVE_NAME/rcodesign" - name: Write credentials env: @@ -473,10 +454,11 @@ jobs: OUTER - name: Download staged standalone binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: staged-standalone-${{ runner.os }} + pattern: staged-standalone-${{ runner.os }}-* path: ddev/archives + merge-multiple: true - name: Extract staged standalone binaries run: ${{ steps.script-extract.outputs.script }} @@ -497,9 +479,9 @@ jobs: done - name: Upload standalone binaries - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: standalone + name: standalone-${{ runner.os }} path: ddev/archives/* if-no-files-found: error @@ -507,10 +489,11 @@ jobs: run: rm -rf archives bin notarize-bin - name: Download staged managed binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: staged-managed-${{ runner.os }} + pattern: staged-managed-${{ runner.os }}-* path: ddev/archives + merge-multiple: true - name: Extract staged managed binaries run: ${{ steps.script-extract.outputs.script }} @@ -576,10 +559,11 @@ jobs: "signed/${{ steps.pkg.outputs.path }}" - name: Upload installer - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: installers + name: installers-${{ runner.os }} path: ddev/signed/${{ steps.pkg.outputs.path }} + if-no-files-found: error publish: name: Publish release @@ -593,22 +577,25 @@ jobs: steps: - name: Download Python artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: python-artifacts path: dist - name: Download binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: + pattern: standalone-* name: standalone path: archives + merge-multiple: true - name: Download installers - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: installers + pattern: installers-* path: installers + merge-multiple: true - name: Push Python artifacts to PyPI uses: pypa/gh-action-pypi-publish@v1.8.6 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 88b04cfafe94b..b79a8b0d046b2 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -59,7 +59,7 @@ jobs: - name: Build documentation run: ddev -v docs build - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: documentation path: site @@ -72,7 +72,7 @@ jobs: - build steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4 with: name: documentation path: site diff --git a/.github/workflows/save-event.yml b/.github/workflows/save-event.yml index 7617e8f55b40c..faa83bd83ac73 100644 --- a/.github/workflows/save-event.yml +++ b/.github/workflows/save-event.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Upload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: github-event path: ${{ github.event_path }} diff --git a/.github/workflows/submit-traces.yml b/.github/workflows/submit-traces.yml index 95c428cf448f9..8fa118d82e1e5 100644 --- a/.github/workflows/submit-traces.yml +++ b/.github/workflows/submit-traces.yml @@ -31,7 +31,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 id: download with: name: "${{ inputs.artifact-name }}" diff --git a/.github/workflows/test-results-master.yml b/.github/workflows/test-results-master.yml index a97ee43e5c6bf..d776cb65760aa 100644 --- a/.github/workflows/test-results-master.yml +++ b/.github/workflows/test-results-master.yml @@ -21,7 +21,7 @@ jobs: with: ref: "${{ env.BADGES_BRANCH }}" - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: test-results path: test-results diff --git a/.github/workflows/test-target.yml b/.github/workflows/test-target.yml index 193d7d7fd0fc8..951a4972b3a74 100644 --- a/.github/workflows/test-target.yml +++ b/.github/workflows/test-target.yml @@ -244,7 +244,7 @@ jobs: - name: Upload captured traces if: inputs.repo == 'core' && always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "${{ inputs.traces-artifact-name }}" path: "${{ env.TRACE_CAPTURE_FILE }}" @@ -259,7 +259,7 @@ jobs: - name: Upload test results if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-results path: "${{ env.TEST_RESULTS_BASE_DIR }}"