diff --git a/.github/workflows/build-push-edge-debug.yaml b/.github/workflows/build-push-edge-debug.yaml index 6fe503bfc..f93b01d2d 100644 --- a/.github/workflows/build-push-edge-debug.yaml +++ b/.github/workflows/build-push-edge-debug.yaml @@ -3,12 +3,13 @@ name: Build and push edge debug tag on: push: branches: - - 'main' + - "main" paths-ignore: - - 'docs/**' - - 'helm/**' - - 'assets/**' - - '**.md' + - "assets/**" + - "docs/**" + - "helm/**" + - "scripts/**" + - "**.md" jobs: docker: diff --git a/.github/workflows/build-push-edge.yaml b/.github/workflows/build-push-edge.yaml index a93e6673e..cb002635e 100644 --- a/.github/workflows/build-push-edge.yaml +++ b/.github/workflows/build-push-edge.yaml @@ -3,12 +3,13 @@ name: Build and push edge tag on: push: branches: - - 'main' + - "main" paths-ignore: - - 'docs/**' - - 'helm/**' - - 'assets/**' - - '**.md' + - "assets/**" + - "docs/**" + - "helm/**" + - "scripts/**" + - "**.md" jobs: docker: diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml deleted file mode 100644 index fac178932..000000000 --- a/.github/workflows/integration-test.yaml +++ /dev/null @@ -1,35 +0,0 @@ -name: Integration - -on: - pull_request: - paths-ignore: - - 'docs/**' - - 'helm/**' - - 'assets/**' - - '**.md' - -jobs: - - docker-compose-test: - name: Quest Smoke and Load Tests for Standalone deployments - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Start compose - run: docker compose -f docker-compose-test.yaml up --build --exit-code-from quest - - name: Stop compose - if: always() - run: docker compose -f docker-compose-test.yaml down - - docker-compose-distributed-test: - name: Quest Smoke and Load Tests for Distributed deployments - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Start compose - run: docker compose -f docker-compose-distributed-test.yaml up --build --exit-code-from quest - - name: Stop compose - if: always() - run: docker compose -f docker-compose-distributed-test.yaml down diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml deleted file mode 100644 index 4f2578cf5..000000000 --- a/.github/workflows/lint.yaml +++ /dev/null @@ -1,61 +0,0 @@ -name: Linter - -on: - pull_request: - paths-ignore: - - 'docs/**' - - 'helm/**' - - 'assets/**' - - '**.md' - -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -jobs: - - unit-tests: - name: Unit tests - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - uses: actions-rs/cargo@v1 - with: - command: test - - fmt: - name: Rust fmt check - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - run: rustup component add rustfmt - - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check - - clippy: - name: Cargo Clippy check - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - run: rustup component add clippy - - uses: actions-rs/cargo@v1 - with: - command: clippy - args: -- -D warnings diff --git a/.github/workflows/pull.yaml b/.github/workflows/pull.yaml new file mode 100644 index 000000000..d18fc8869 --- /dev/null +++ b/.github/workflows/pull.yaml @@ -0,0 +1,79 @@ +name: Integration + +on: + pull_request: + paths-ignore: + - "assets/**" + - "docs/**" + - "helm/**" + - "scripts/**" + - "**.md" + +jobs: + fmt: + name: Rust fmt and clippy + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + - uses: Swatinem/rust-cache@v2 + with: + shared-key: "target-cache" + - run: rustup component add rustfmt clippy + - uses: actions-rs/cargo@v1 + with: + command: fmt + args: --all -- --check + - uses: actions-rs/cargo@v1 + with: + command: clippy + args: -- -D warnings + + unit-tests: + name: Unit tests + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + - uses: Swatinem/rust-cache@v2 + with: + shared-key: "target-cache" + - uses: actions-rs/cargo@v1 + with: + command: test + + docker-compose-test: + name: Quest Smoke and Load Tests for Standalone deployments + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - uses: Swatinem/rust-cache@v2 + with: + shared-key: "target-cache" + - name: Start compose + run: docker compose -f docker-compose-test.yaml up --build --exit-code-from quest + - name: Stop compose + run: docker compose -f docker-compose-test.yaml down + + docker-compose-distributed-test: + name: Quest Smoke and Load Tests for Distributed deployments + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - uses: Swatinem/rust-cache@v2 + with: + shared-key: "target-cache" + - name: Start compose + run: docker compose -f docker-compose-distributed-test.yaml up --build --exit-code-from quest + - name: Stop compose + run: docker compose -f docker-compose-distributed-test.yaml down diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 770a5af1e..dd06b49bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,9 +5,10 @@ on: tags: - v[0-9]+.[0-9]+.[0-9]+* paths-ignore: + - "assets/**" - "docs/**" - "helm/**" - - "assets/**" + - "scripts/**" - "**.md" jobs: diff --git a/Dockerfile b/Dockerfile index cfd88348b..a1c446862 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ # along with this program. If not, see . # build stage -FROM rust:1.77.1-bookworm as builder +FROM rust:1.77.1-bookworm AS builder LABEL org.opencontainers.image.title="Parseable" LABEL maintainer="Parseable Team " diff --git a/Dockerfile.debug b/Dockerfile.debug index acbc44698..a1846d4a7 100644 --- a/Dockerfile.debug +++ b/Dockerfile.debug @@ -14,7 +14,7 @@ # along with this program. If not, see . # build stage -FROM rust:1.77.1-bookworm as builder +FROM rust:1.77.1-bookworm AS builder LABEL org.opencontainers.image.title="Parseable" LABEL maintainer="Parseable Team "