Skip to content

Commit

Permalink
Simplify CI/CD pipeline configuration
Browse files Browse the repository at this point in the history
Removed direct service dependencies and environment variables from CI/CD pipeline configuration files. Instead of running services like MySQL, Redis, and Postgres directly, we are now utilizing docker-compose to manage these services. Moreover, adjusted checkout, rust installation, and test running steps according to the new changes.
  • Loading branch information
chrisllontop committed Apr 16, 2024
1 parent 0f10f2e commit ef861c1
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 57 deletions.
67 changes: 11 additions & 56 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,89 +9,44 @@ on:
jobs:
build:
runs-on: ubuntu-latest
services:
mysql:
image: mysql:latest
env:
MYSQL_ROOT_PASSWORD: my-secret-pw
MYSQL_DATABASE: keyv_test
MYSQL_USER: user
MYSQL_PASSWORD: password
ports:
- 3306:3306
options: >-
--health-cmd="mysqladmin ping -h localhost"
--health-interval=10s
--health-timeout=5s
--health-retries=5
postgres:
image: postgres:latest
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: keyv_test
ports:
- 5432:5432
options: >-
--health-cmd="pg_isready -U postgres"
--health-interval=10s
--health-timeout=5s
--health-retries=5
redis:
image: redis:latest
ports:
- 6379:6379
options: >-
--health-cmd="redis-cli ping"
--health-interval=10s
--health-timeout=5s
--health-retries=5
env:
# emit backtraces on panics.
RUST_BACKTRACE: 1
steps:
- uses: actions/checkout@v4
- name: Checkout Code
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Get the build metadata
shell: bash
run: |
echo "TAG_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
echo "CARGO_VERSION=$(grep -m 1 '^version = ' Cargo.toml | cut -f 3 -d ' ' | tr -d \")" >> $GITHUB_ENV
- name: Validate git tag and Cargo.toml version
shell: bash
if: startsWith(github.ref, 'refs/tags/')

- name: Start Services
run: |
if [ "${{ env.TAG_VERSION }}" != "v${{ env.CARGO_VERSION }}" ]; then
echo "git tag version (${{ env.TAG_VERSION }}) does not match Cargo.toml version (v${{ env.CARGO_VERSION }})"
exit 1
fi
docker-compose up -d
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
profile: minimal
components: rustfmt, clippy

- uses: swatinem/rust-cache@v2.7.3

- name: Rust fmt
uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check

- name: Run Clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --all-features

- name: Build release
uses: actions-rs/cargo@v1
with:
command: build
args: --verbose --all --release --all-features

- name: Run Test
uses: actions-rs/cargo@v1
with:
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,41 @@ jobs:
build_and_test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Checkout Code
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Start services
run: |
docker-compose up -d
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: rustfmt, clippy

- uses: swatinem/rust-cache@v2.7.3

- name: Run fmt
uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check

- name: Run clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --all -- -D warnings

- name: Run Tests
uses: actions-rs/cargo@v1
with:
command: test
args: --all

- name: Build Release
uses: actions-rs/cargo@v1
with:
Expand Down

0 comments on commit ef861c1

Please sign in to comment.