diff --git a/.cirrus.yml b/.cirrus.yml index 0215f97..287f488 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -113,13 +113,13 @@ elk_windows_build_and_test_release_template: &ELK_WINDOWS_BUILD_AND_TEST_RELEASE only_if: $CIRRUS_BRANCH == 'main' || ($CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'main') -# task: -# <<: *ELK_CONTAINER_UBUNTU_22_04_X64 -# script: -# - echo $CIRRUS_PR -# - echo $CIRRUS_BRANCH -# - echo foo -# - echo bar +task: + <<: *ELK_CONTAINER_UBUNTU_22_04_X64 + script: + - echo $CIRRUS_PR + - echo $CIRRUS_BRANCH + - echo foo + - echo bar # only_if: $CIRRUS_BRANCH == 'main' # only_if: $CIRRUS_PR > 0 @@ -138,12 +138,12 @@ only_if: $CIRRUS_BRANCH == 'main' || ($CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == # <<: *ELK_COMMON_BUILD_AND_TEST_DEBUG # before_cache_script: rm -rf $CARGO_HOME/registry/index -# ubuntu_nighlty_task: -# only_if: $CIRRUS_BRANCH == 'main' -# # depends_on: preflight_check -# <<: *ELK_CONTAINER_UBUNTU_22_04_X64 -# set_toolchain_script: rustup default nightly -# <<: *ELK_COMMON_BUILD_AND_TEST_RELEASE +ubuntu_nighlty_task: + only_if: $CIRRUS_BRANCH == 'main' + # depends_on: preflight_check + <<: *ELK_CONTAINER_UBUNTU_22_04_X64 + set_toolchain_script: rustup default nightly + <<: *ELK_COMMON_BUILD_AND_TEST_RELEASE windows_server_2019_x64_stable_debug_task: diff --git a/.github/workflows/update-rust-docker-images.yml b/.github/workflows/update-rust-docker-images.yml index 44d561e..5f9d5b4 100644 --- a/.github/workflows/update-rust-docker-images.yml +++ b/.github/workflows/update-rust-docker-images.yml @@ -31,7 +31,7 @@ jobs: run: | export EXPECTED_RUST_VERSION_ENV="EXPECTED_RUST_VERSION=\"${LATEST_RUST_RELEASE}\"" export PATH_TO_DOCKER_FILES="internal/docker" - find "${PATH_TO_DOCKER_FILES}" -type f -exec sed -i "s/EXPECTED_RUST_VERSION=\".*\"/${EXPECTED_RUST_VERSION_ENV}/" {} \; + find "${PATH_TO_DOCKER_FILES}" -type f -exec sed -i "s/EXPECTED_RUST_VERSION='.*'/${EXPECTED_RUST_VERSION_ENV}/" {} \; - name: Create Pull Request uses: peter-evans/create-pull-request@v5