diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d7e997c..b105b8f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,14 +100,14 @@ jobs: steps: - name: Check out source code if: ${{ github.event_name != 'pull_request_target' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 persist-credentials: false - name: Check out source code (pull request) if: ${{ github.event_name == 'pull_request_target' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 @@ -119,7 +119,7 @@ jobs: echo "${VERSION:1}" > version - name: Upload version file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: version path: version @@ -235,7 +235,7 @@ jobs: MATRIX_HOSTS+='{ "name": "linux-x86_64", "runner": "zephyr-runner-v2-linux-x64-4xlarge", - "container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.2.3", + "container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.3.0", "archive": "tar.xz" },' fi @@ -244,7 +244,7 @@ jobs: MATRIX_HOSTS+='{ "name": "linux-aarch64", "runner": "zephyr-runner-v2-linux-arm64-4xlarge", - "container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.2.3", + "container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.3.0", "archive": "tar.xz" },' fi @@ -271,7 +271,7 @@ jobs: MATRIX_HOSTS+='{ "name": "windows-x86_64", "runner": "zephyr-runner-v2-linux-x64-4xlarge", - "container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.2.3", + "container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.3.0", "archive": "7z" },' fi @@ -558,14 +558,14 @@ jobs: - name: Check out source code if: ${{ github.event_name != 'pull_request_target' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive persist-credentials: false - name: Check out source code (pull request) if: ${{ github.event_name == 'pull_request_target' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} submodules: recursive @@ -607,13 +607,13 @@ jobs: ${CT_NG} version - name: Download version information - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: version path: ${{ runner.temp }} - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1-node16 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_CACHE_SDK_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_CACHE_SDK_SECRET_ACCESS_KEY }} @@ -811,13 +811,13 @@ jobs: - name: Upload toolchain build log if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: log_${{ matrix.host.name }}_${{ matrix.target }} path: ${{ matrix.target }}.log - name: Upload toolchain build artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: toolchain_${{ matrix.host.name }}_${{ matrix.target }} path: | @@ -875,21 +875,21 @@ jobs: - name: Check out source code if: ${{ github.event_name != 'pull_request_target' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive persist-credentials: false - name: Check out source code (pull request) if: ${{ github.event_name == 'pull_request_target' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} submodules: recursive persist-credentials: false - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1-node16 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_CACHE_SDK_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_CACHE_SDK_SECRET_ACCESS_KEY }} @@ -963,7 +963,7 @@ jobs: - name: Upload toolchain build artifact if: startsWith(matrix.host.name, 'linux-') # FIXME: Do for all - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: hosttools_${{ matrix.host.name }} path: | @@ -1026,13 +1026,13 @@ jobs: - name: Check out source code if: ${{ github.event_name != 'pull_request_target' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false - name: Check out source code (pull request) if: ${{ github.event_name == 'pull_request_target' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} persist-credentials: false @@ -1056,7 +1056,7 @@ jobs: sha256sum ${ARCHIVE_FILE} > sha256.sum - name: Upload CMake package build artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cmake_${{ matrix.host.name }} path: | @@ -1116,21 +1116,21 @@ jobs: - name: Check out source code if: ${{ github.event_name != 'pull_request_target' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: repository persist-credentials: false - name: Check out source code (pull request) if: ${{ github.event_name == 'pull_request_target' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} path: repository persist-credentials: false - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: # NOTE: This downloads all build artifacts, including the toolchains and host tools for # the irrelevant hosts, because the download-artifact action does not support @@ -1245,7 +1245,7 @@ jobs: sha256sum ${ARCHIVE_NAME}.${EXT} ${ARCHIVE_NAME}_minimal.${EXT} > sha256.sum - name: Upload distribution bundle - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.BUNDLE_ARCHIVE_NAME }} path: | @@ -1279,7 +1279,7 @@ jobs: steps: - name: Set up Python if: ${{ runner.os == 'Windows' }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: # Force Python 3.10 because the twister is not compatible with a Python # version lower than 3.8 on Windows. @@ -1363,7 +1363,7 @@ jobs: echo "VENV_ACTIVATE=${VENV_ACTIVATE}" >> $GITHUB_ENV - name: Download version information - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: version path: artifacts @@ -1382,7 +1382,7 @@ jobs: echo "BUNDLE_DIR=${BUNDLE_DIR}" >> $GITHUB_ENV - name: Download distribution bundle - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.BUNDLE_NAME }} path: artifacts @@ -1620,7 +1620,7 @@ jobs: - name: Publish test results if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test_${{ matrix.testenv.name }}_${{ matrix.subset }} if-no-files-found: ignore diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e840fa4b..b4d902ea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: rm -rf ${GITHUB_WORKSPACE}/* - name: Download build artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: artifacts @@ -63,37 +63,37 @@ jobs: # into the runner memory at once and this may cause the runner instance to # run out of memory (see the GitHub issue #520). - name: Upload release assets (host tools) - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: | assets/hosttools_* - name: Upload release assets (Linux toolchains) - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: | assets/toolchain_linux* - name: Upload release assets (macOS toolchains) - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: | assets/toolchain_macos* - name: Upload release assets (Windows toolchains) - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: | assets/toolchain_windows* - name: Upload release assets (Distribution bundles) - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: | assets/${{ env.BUNDLE_PREFIX }}-* - name: Upload release assets (checksum) - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: | md5.sum diff --git a/meta-zephyr-sdk/scripts/meta-zephyr-sdk-clone.sh b/meta-zephyr-sdk/scripts/meta-zephyr-sdk-clone.sh index 0bce94f5..3f41d826 100755 --- a/meta-zephyr-sdk/scripts/meta-zephyr-sdk-clone.sh +++ b/meta-zephyr-sdk/scripts/meta-zephyr-sdk-clone.sh @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -POKY_KNOWN_COMMIT=${POKY_COMMIT:-"8daedc01101e686fc640c164004c0ec4e5f90b4e"} +POKY_KNOWN_COMMIT=${POKY_COMMIT:-"92c9c181ff23b41009ef9b3d674ab32b067cc50b"} META_ZEPHYR_SDK_SOURCE=${SDK_SOURCE:-"meta-zephyr-sdk"} META_POKY_SOURCE=${POKY_SOURCE:-"poky"} META_ZEPHYR_SDK_SOURCE=$(readlink -f $META_ZEPHYR_SDK_SOURCE)