This is an automated email from the ASF dual-hosted git repository.
hgruszecki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iggy.git
The following commit(s) were added to refs/heads/master by this push:
new fcad6395b fix(repo): fix dependabot, server commit hash print, rm old
gh workflows (#2218)
fcad6395b is described below
commit fcad6395b751472cf9ec146af131912ac9bdd2c9
Author: Hubert Gruszecki <[email protected]>
AuthorDate: Tue Nov 18 12:10:24 2025 +0100
fix(repo): fix dependabot, server commit hash print, rm old gh workflows
(#2218)
---
.dockerignore | 1 -
.github/workflows/dependabot-licenses.yml | 7 +-
.../workflows/build-and-test.yml | 69 ----------------
.../old_github_workflows/workflows/ci.yml | 42 ----------
.../old_github_workflows/workflows/docker.yml | 91 ----------------------
.../old_github_workflows/workflows/sanity.yml | 68 ----------------
core/server/Cargo.toml | 2 +-
core/server/{src => }/build.rs | 0
8 files changed, 6 insertions(+), 274 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index 3c4962a11..70ad7f002 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,5 @@
.config
.dockerignore
-.git
.github
.gitignore
.idea
diff --git a/.github/workflows/dependabot-licenses.yml
b/.github/workflows/dependabot-licenses.yml
index c482a6a98..d58f91aeb 100644
--- a/.github/workflows/dependabot-licenses.yml
+++ b/.github/workflows/dependabot-licenses.yml
@@ -40,8 +40,11 @@ jobs:
ref: ${{ github.event.pull_request.head.ref }}
token: ${{ secrets.GITHUB_TOKEN }}
- - name: Setup Rust
- uses: dtolnay/rust-action@stable
+ - name: Setup Rust with cache
+ uses: ./.github/actions/utils/setup-rust-with-cache
+ with:
+ cache-targets: false # Only cache registry and git deps, not target
dir (sccache handles that)
+ show-stats: true
- name: Install cargo-license
run: cargo install cargo-license
diff --git
a/core/bench/dashboard/old_github_workflows/workflows/build-and-test.yml
b/core/bench/dashboard/old_github_workflows/workflows/build-and-test.yml
deleted file mode 100644
index c18980da3..000000000
--- a/core/bench/dashboard/old_github_workflows/workflows/build-and-test.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: build-and-test
-on:
- workflow_call:
-
-jobs:
- build:
- name: Build
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v4
-
- - name: Install Rust
- uses: dtolnay/rust-toolchain@stable
-
- - name: Rust Cache
- uses: Swatinem/rust-cache@v2
-
- - name: Install trunk
- uses: jetli/[email protected]
- with:
- version: 'latest'
-
- - name: Install wasm-target
- run: |
- rustup target add wasm32-unknown-unknown
- echo "Using Rust toolchain from rust-toolchain.toml: $(rustup show)"
-
- - name: Build Frontend
- run: |
- cd frontend
- trunk build --release
-
- - name: Build Server
- run: cargo build --release --package bench-dashboard-server
-
- - name: Build Runner
- run: cargo build --release --package bench-runner
-
- test:
- name: Test
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v4
-
- - name: Install Rust
- uses: dtolnay/rust-toolchain@stable
-
- - name: Rust Cache
- uses: Swatinem/rust-cache@v2
-
- - name: Run tests
- run: cargo test --all-features --workspace
diff --git a/core/bench/dashboard/old_github_workflows/workflows/ci.yml
b/core/bench/dashboard/old_github_workflows/workflows/ci.yml
deleted file mode 100644
index 979ae3e90..000000000
--- a/core/bench/dashboard/old_github_workflows/workflows/ci.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: CI
-
-on:
- push:
- branches: [ "master" ]
- pull_request:
- branches: [ "master" ]
-
-jobs:
- # Run sanity checks first
- sanity:
- uses: ./.github/workflows/sanity.yml
-
- # Run build and test after sanity checks
- build-and-test:
- needs: sanity
- uses: ./.github/workflows/build-and-test.yml
-
- # Trigger Docker workflow if needed
- trigger-docker:
- needs: [sanity, build-and-test]
- uses: ./.github/workflows/docker.yml
- secrets:
- DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
- DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/core/bench/dashboard/old_github_workflows/workflows/docker.yml
b/core/bench/dashboard/old_github_workflows/workflows/docker.yml
deleted file mode 100644
index b85e0a922..000000000
--- a/core/bench/dashboard/old_github_workflows/workflows/docker.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: release-dockerhub
-
-on:
- workflow_call:
- secrets:
- DOCKER_USERNAME:
- required: true
- DOCKER_PASSWORD:
- required: true
-
-env:
- REGISTRY: docker.io
- IMAGE_NAME: apache/iggy-bench-dashboard
-
-jobs:
- docker:
- runs-on: ubuntu-latest
- permissions:
- contents: read
- packages: write
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@v4
- with:
- fetch-depth: 2 # We need at least 2 commits to compare changes
-
- - name: Check if Cargo.toml version changed
- id: check_version
- run: |
- if [ "${{ github.event_name }}" = "pull_request" ]; then
- echo "Pull request - will build but not push"
- echo "should_push=false" >> $GITHUB_OUTPUT
- else
- if git diff HEAD^ HEAD -- Cargo.toml | grep -q "version = "; then
- echo "Version in Cargo.toml changed"
- VERSION=$(grep "^version = " Cargo.toml | cut -d'"' -f2)
- echo "version=${VERSION}" >> $GITHUB_OUTPUT
- echo "should_push=true" >> $GITHUB_OUTPUT
- else
- echo "Version in Cargo.toml did not change"
- echo "should_push=false" >> $GITHUB_OUTPUT
- fi
- fi
-
- - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v3
-
- - name: Log in to Docker Hub
- if: github.event_name == 'push' &&
steps.check_version.outputs.should_push == 'true'
- uses: docker/login-action@v3
- with:
- username: ${{ secrets.DOCKER_USERNAME }}
- password: ${{ secrets.DOCKER_PASSWORD }}
-
- - name: Extract metadata (tags, labels) for Docker
- id: meta
- uses: docker/metadata-action@v5
- with:
- images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- tags: |
- type=semver,pattern={{version}},value=${{
steps.check_version.outputs.version }}
- type=semver,pattern={{major}}.{{minor}},value=${{
steps.check_version.outputs.version }}
- type=raw,value=latest,enable=${{ github.event_name == 'push' &&
steps.check_version.outputs.should_push == 'true' }}
-
- - name: Build and push Docker image
- uses: docker/build-push-action@v5
- with:
- context: .
- push: ${{ github.event_name == 'push' &&
steps.check_version.outputs.should_push == 'true' }}
- tags: ${{ steps.meta.outputs.tags }}
- labels: ${{ steps.meta.outputs.labels }}
- cache-from: type=gha
- cache-to: type=gha,mode=max
diff --git a/core/bench/dashboard/old_github_workflows/workflows/sanity.yml
b/core/bench/dashboard/old_github_workflows/workflows/sanity.yml
deleted file mode 100644
index 610331f77..000000000
--- a/core/bench/dashboard/old_github_workflows/workflows/sanity.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: sanity
-on:
- workflow_dispatch:
- workflow_call:
-
-jobs:
- check:
- name: Check
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v4
- - uses: dtolnay/rust-toolchain@stable
- - uses: clechasseur/rs-cargo@v2
- with:
- command: check
- fmt:
- name: Rustfmt
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v4
- - uses: dtolnay/rust-toolchain@stable
- - run: rustup component add rustfmt
- - uses: clechasseur/rs-cargo@v2
- with:
- command: fmt
- args: --all -- --check
- clippy:
- name: Clippy
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v4
- - uses: dtolnay/rust-toolchain@stable
- - uses: clechasseur/rs-cargo@v2
- with:
- command: clippy
- args: --all-targets --all-features -- -D warnings
-
- doctest:
- name: Test documentation
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v4
- - uses: dtolnay/rust-toolchain@stable
- - run: cargo test --doc
-
- unused_dependencies:
- name: Unused dependencies
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v4
- - uses: bnjbvr/[email protected]
diff --git a/core/server/Cargo.toml b/core/server/Cargo.toml
index 0f92a1aa4..a93eea683 100644
--- a/core/server/Cargo.toml
+++ b/core/server/Cargo.toml
@@ -19,13 +19,13 @@
name = "server"
version = "0.6.0-edge.3"
edition = "2024"
-build = "src/build.rs"
license = "Apache-2.0"
[package.metadata.cargo-udeps.ignore]
normal = ["tracing-appender"]
[package.metadata.cargo-machete]
+ignored = ["vergen-git2"]
[[bin]]
name = "iggy-server"
diff --git a/core/server/src/build.rs b/core/server/build.rs
similarity index 100%
rename from core/server/src/build.rs
rename to core/server/build.rs
