diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 538d9be0..260e9605 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -217,13 +217,6 @@ jobs: aws configure set aws_access_key_id ${{ secrets.STORAGE_ACCESS_KEY }} aws configure set aws_secret_access_key ${{ secrets.STORAGE_ACCESS_SECRET }} aws configure set default.s3.signature_version s3v4 - - name: Get cache - run: | - aws --endpoint-url ${{ secrets.STORAGE_ACCESS_URL }} s3 cp --no-progress s3://cache/skytable-linux-arm64-release.tar.zst target.tar.zst - tar -I zstd -xf target.tar.zst - rm target.tar.zst - echo "LASTHASH=$(cat target/LASTHASH 2>/dev/null)" >> $GITHUB_ENV - continue-on-error: true - name: Install Rust run: | curl https://sh.rustup.rs -sSf | sh -s -- -y @@ -240,19 +233,6 @@ jobs: VERSION: ${{ steps.get_version.outputs.VERSION }} ARTIFACT: aarch64-linux-gnu run: make bundle - - name: Save cache - env: - NEWHASH: ${{ hashFiles('Cargo.lock') }} - LASTHASH: ${{ env.LASTHASH }} - run: | - if [[ ${NEWHASH} != ${LASTHASH} ]]; then - echo "Freshening cache" - tar --zstd -cf target.tar.zst target - aws --endpoint-url ${{ secrets.STORAGE_ACCESS_URL }} s3 cp --no-progress target.tar.zst s3://cache/skytable-linux-arm64-release.tar.zst - echo "Finished freshening cache" - else - echo "Cache hit occurred. Not saving cache" - fi - name: Upload bundle run: | aws --endpoint-url ${{ secrets.STORAGE_ACCESS_URL }} s3 cp sky-bundle-${{ steps.get_version.outputs.VERSION }}-aarch64-linux-gnu.zip s3://releases/${{ steps.get_version.outputs.VERSION }}/ diff --git a/.github/workflows/test-push.yml b/.github/workflows/test-push.yml index b83b45e7..d35927e1 100644 --- a/.github/workflows/test-push.yml +++ b/.github/workflows/test-push.yml @@ -284,13 +284,6 @@ jobs: aws configure set aws_access_key_id ${{ secrets.STORAGE_ACCESS_KEY }} aws configure set aws_secret_access_key ${{ secrets.STORAGE_ACCESS_SECRET }} aws configure set default.s3.signature_version s3v4 - - name: Get cache - run: | - aws --endpoint-url ${{ secrets.STORAGE_ACCESS_URL }} s3 cp --no-progress s3://cache/skytable-linux-arm64.tar.zst target.tar.zst - tar -I zstd -xf target.tar.zst - rm target.tar.zst - echo "LASTHASH=$(cat target/LASTHASH 2>/dev/null)" >> $GITHUB_ENV - continue-on-error: true - name: Install Rust run: | curl https://sh.rustup.rs -sSf | sh -s -- -y @@ -302,19 +295,6 @@ jobs: - name: Stress test run: make stress if: "contains(toJSON(github.event.commits.*.msg), '[stress-ci]')" - - name: Save cache - env: - NEWHASH: ${{ hashFiles('Cargo.lock') }} - LASTHASH: ${{ env.LASTHASH }} - run: | - if [[ ${NEWHASH} != ${LASTHASH} ]]; then - echo "Freshening cache" - tar --zstd -cf target.tar.zst target - aws --endpoint-url ${{ secrets.STORAGE_ACCESS_URL }} s3 cp --no-progress target.tar.zst s3://cache/skytable-linux-arm64.tar.zst - echo "Finished freshening cache" - else - echo "Cache hit occurred. Not saving cache" - fi - name: Save artifacts run: | cargo build -j16 --target aarch64-unknown-linux-gnu diff --git a/Cargo.lock b/Cargo.lock index 87ae9e16..e1d1ff4a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -394,9 +394,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013" +checksum = "a60553f9a9e039a333b4e9b20573b9e9b9c0bb3a11e201ccc48ef4283456d673" [[package]] name = "libsky" @@ -539,9 +539,9 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "openssl" -version = "0.10.37" +version = "0.10.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc6b9e4403633698352880b22cbe2f0e45dd0177f6fabe4585536e56a3e4f75" +checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" dependencies = [ "bitflags", "cfg-if", @@ -553,18 +553,18 @@ dependencies = [ [[package]] name = "openssl-src" -version = "111.16.0+1.1.1l" +version = "300.0.2+3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f" +checksum = "14a760a11390b1a5daf72074d4f6ff1a6e772534ae191f999f57e9ee8146d1fb" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.68" +version = "0.9.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c571f25d3f66dd427e417cebf73dbe2361d6125cf6e3a70d143fdf97c9f5150" +checksum = "c6517987b3f8226b5da3661dad65ff7f300cc59fb5ea8333ca191fc65fde3edf" dependencies = [ "autocfg", "cc", diff --git a/server/Cargo.toml b/server/Cargo.toml index 3fddb716..4287be93 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -19,7 +19,7 @@ env_logger = "0.9.0" hashbrown = { version = "0.11.2", features = ["raw"] } log = "0.4.14" num_cpus = "1.13.0" -openssl = { version = "0.10.37", features = ["vendored"] } +openssl = { version = "0.10.38", features = ["vendored"] } parking_lot = "0.11.2" regex = "1.5.4" serde = { version = "1.0.130", features = ["derive"] } @@ -51,7 +51,7 @@ rand = "0.8.4" tokio = { version = "1.13.0", features = ["test-util"] } [target.'cfg(unix)'.dependencies] # external deps -libc = "0.2.105" +libc = "0.2.106" [features] nightly = []