rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-10 15:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deceiving rust version from the CI files

Browse Source
This commit is contained in:
Kirill Bulatov
2022-09-09 16:47:09 +03:00
committed by Kirill Bulatov
parent 648e86e9df
commit 18dafbb9ba
3 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/actions/run-python-test-set/action.yml vendored
View File

@@ -5,9 +5,6 @@ inputs:
build_type:
description: 'Type of Rust (neon) and C (postgres) builds. Must be "release" or "debug", or "remote" for the remote cluster'
required: true
rust_toolchain:
description: 'Rust toolchain version to fetch the caches'
required: false
test_selection:
description: 'A python test suite to run'
required: true
@@ -55,7 +52,7 @@ runs:
if: inputs.build_type != 'remote'
uses: ./.github/actions/download
with:
name: neon-${{ runner.os }}-${{ inputs.build_type }}-${{ inputs.rust_toolchain }}-artifact
name: neon-${{ runner.os }}-${{ inputs.build_type }}-artifact
path: /tmp/neon
- name: Checkout

22
.github/workflows/build_and_test.yml vendored
View File

@@ -54,11 +54,6 @@ jobs:
fail-fast: false
matrix:
build_type: [ debug, release ]
# TODO this version is currently needed to make build statuses more informative
# and to clear cargo caches in a more transparent way.
# We should rather read this value from the file in the root of the repo, `rust-toolchain.toml` since it's
# truly setting what version of compiler the sources are built with
rust_toolchain: [ '1.60' ]
env:
BUILD_TYPE: ${{ matrix.build_type }}
@@ -130,8 +125,8 @@ jobs:
target/
# Fall back to older versions of the key, if no cache for current Cargo.lock was found
key: |
v7-${{ runner.os }}-${{ matrix.build_type }}-cargo-${{ matrix.rust_toolchain }}-${{ hashFiles('Cargo.lock') }}
v7-${{ runner.os }}-${{ matrix.build_type }}-cargo-${{ matrix.rust_toolchain }}-
v8-${{ runner.os }}-${{ matrix.build_type }}-cargo-${{ hashFiles('Cargo.lock') }}
v8-${{ runner.os }}-${{ matrix.build_type }}-cargo-
- name: Cache postgres v14 build
id: cache_pg_14
@@ -219,7 +214,7 @@ jobs:
- name: Upload Neon artifact
uses: ./.github/actions/upload
with:
name: neon-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.rust_toolchain }}-artifact
name: neon-${{ runner.os }}-${{ matrix.build_type }}-artifact
path: /tmp/neon
- name: Prepare cargo build timing stats for storing
@@ -230,7 +225,7 @@ jobs:
- name: Upload cargo build stats
uses: ./.github/actions/upload
with:
name: neon-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.rust_toolchain }}-build-stats
name: neon-${{ runner.os }}-${{ matrix.build_type }}-build-stats
path: /tmp/neon/cargo-timings/
# XXX: keep this after the binaries.list is formed, so the coverage can properly work later
@@ -248,7 +243,6 @@ jobs:
fail-fast: false
matrix:
build_type: [ debug, release ]
rust_toolchain: [ '1.60' ]
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -260,7 +254,6 @@ jobs:
uses: ./.github/actions/run-python-test-set
with:
build_type: ${{ matrix.build_type }}
rust_toolchain: ${{ matrix.rust_toolchain }}
test_selection: regress
needs_postgres_source: true
run_with_real_s3: true
@@ -284,7 +277,6 @@ jobs:
fail-fast: false
matrix:
build_type: [ release ]
rust_toolchain: [ '1.60' ]
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -296,7 +288,6 @@ jobs:
uses: ./.github/actions/run-python-test-set
with:
build_type: ${{ matrix.build_type }}
rust_toolchain: ${{ matrix.rust_toolchain }}
test_selection: performance
run_in_parallel: false
save_perf_report: true
@@ -356,7 +347,6 @@ jobs:
fail-fast: false
matrix:
build_type: [ debug ]
rust_toolchain: [ '1.60' ]
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -373,12 +363,12 @@ jobs:
!~/.cargo/registry/src
~/.cargo/git/
target/
key: v7-${{ runner.os }}-${{ matrix.build_type }}-cargo-${{ matrix.rust_toolchain }}-${{ hashFiles('Cargo.lock') }}
key: v8-${{ runner.os }}-${{ matrix.build_type }}-cargo-${{ hashFiles('Cargo.lock') }}
- name: Get Neon artifact
uses: ./.github/actions/download
with:
name: neon-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.rust_toolchain }}-artifact
name: neon-${{ runner.os }}-${{ matrix.build_type }}-artifact
path: /tmp/neon
- name: Get coverage artifact

17
.github/workflows/codestyle.yml vendored
View File

@@ -24,8 +24,11 @@ jobs:
strategy:
fail-fast: false
matrix:
# TODO read from `rust-toolchain.toml` and do the same in the build and test workflow too.
rust_toolchain: ['1.60']
# XXX: both OSes have rustup
# * https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md#rust-tools
# * https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md#rust-tools
# this is all we need to install our toolchain later via rust-toolchain.toml
# so don't install any toolchain explicitly.
os: [ubuntu-latest, macos-latest]
# To support several Postgres versions, add them here.
postgres_version: [v14, v15]
@@ -40,14 +43,6 @@ jobs:
submodules: true
fetch-depth: 2
- name: Install rust toolchain ${{ matrix.rust_toolchain }}
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust_toolchain }}
components: rustfmt, clippy
override: true
- name: Check formatting
run: cargo fmt --all -- --check
@@ -106,7 +101,7 @@ jobs:
!~/.cargo/registry/src
~/.cargo/git
target
key: v3-${{ runner.os }}-cargo-${{ hashFiles('./Cargo.lock') }}-rust-${{ matrix.rust_toolchain }}
key: v4-${{ runner.os }}-cargo-${{ hashFiles('./Cargo.lock') }}-rust
- name: Run cargo clippy
run: ./run_clippy.sh