diff --git a/.github/workflows/aardwolf-build.yml b/.github/workflows/aardwolf-build.yml index 0fe5688c..7c6f03b0 100644 --- a/.github/workflows/aardwolf-build.yml +++ b/.github/workflows/aardwolf-build.yml @@ -1,5 +1,5 @@ --- -name: Build +name: CI Build on: push: branches: @@ -19,7 +19,7 @@ jobs: steps: - - name: Checkout + - name: Checkout Repo uses: actions/checkout@v4 # Marketplace - https://github.com/marketplace/actions/checkout # Installs the most recent stable rust toolchain as of the specified time # offset, which may be written in years, months, weeks, or days. @@ -60,7 +60,7 @@ jobs: echo "DATABASE_URL=postgresql://aardwolf_user:changeme@127.0.0.1:5432/aardwolf_testing" > "$GITHUB_ENV" echo "TEST_DATABASE_URL=postgresql://aardwolf_user:changeme@127.0.0.1:5432/aardwolf_testing" >> "$GITHUB_ENV" # Install diesel CLI if not already installed - - name: Check diesel installation + - name: Check Diesel installation run: if which diesel; then echo "diesel already installed"; else cargo install diesel_cli --no-default-features --features=postgres; fi # Push the aardwolf-models directory, and run migrations @@ -70,5 +70,5 @@ jobs: popd # Run cargo build - - name: Cargo build aardwolf + - name: Cargo build Aardwolf run: cargo build diff --git a/.github/workflows/aardwolf-test.yml b/.github/workflows/aardwolf-test.yml index 1ac23617..2818d373 100644 --- a/.github/workflows/aardwolf-test.yml +++ b/.github/workflows/aardwolf-test.yml @@ -1,10 +1,9 @@ --- -name: Test +name: CI Test on: workflow_run: - workflows: - - Build + workflows: ["CI build"] types: - completed @@ -29,4 +28,4 @@ jobs: # Run cargo test - name: Cargo test Aardwolf - run: cargo test --all --verbose \ No newline at end of file + run: cargo test --all --verbose diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2d83f75f..b471257f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -7,7 +7,7 @@ name: 'Docker Image CI' on: pull_request: branches: - - main' + - 'main' - 'banjofox/*' jobs: @@ -17,6 +17,6 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build the Docker image run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)