From 66426dd94bb24c478bb2c8e78057e469581f7a53 Mon Sep 17 00:00:00 2001 From: RaspberryProgramming Date: Wed, 17 Jul 2024 19:15:01 +0000 Subject: [PATCH 1/6] Created action to publish test image, added test branch to rust.yml and removed upload build artifact from rust.yml --- .github/workflows/docker-test.yml | 23 +++++++++++++++++++++++ .github/workflows/rust.yml | 12 +++--------- 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/docker-test.yml diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml new file mode 100644 index 0000000..dfee01b --- /dev/null +++ b/.github/workflows/docker-test.yml @@ -0,0 +1,23 @@ +name: Build and Publish Test Docker Image + +on: + push: + branches: [ "test"] + pull_request: + branches: [ "test" ] + +jobs: + + build: + runs-on: self-hosted + steps: + - uses: actions/checkout@v4 + - run: docker build . -t raspberrypi99/request-mirror + - name: Dockerize + if: success() + uses: manusa/actions-publish-docker@v1.1.2 + with: + name: raspberrypi99/request-mirror + tag: test + username: ${{ secrets.docker_hub_username }} + password: ${{ secrets.docker_hub_password }} diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 59c2a1a..e06d0b9 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -2,9 +2,9 @@ name: Build and Test Rust on: push: - branches: [ "main" ] + branches: [ "main", "test"] pull_request: - branches: [ "main" ] + branches: [ "main", "test" ] env: CARGO_TERM_COLOR: always @@ -26,10 +26,4 @@ jobs: - name: Build run: cargo build --release --verbose - name: Run tests - run: cargo test --release --verbose - - name: Upload a Build Artifact - uses: actions/upload-artifact@v4.3.4 - with: - name: linux-build - path: target/release/request-mirror - \ No newline at end of file + run: cargo test --release --verbose \ No newline at end of file From e3de72572500247b31bb672f74a5b09c8a56266d Mon Sep 17 00:00:00 2001 From: Camerin Figueroa Date: Wed, 17 Jul 2024 16:41:09 -0400 Subject: [PATCH 2/6] Update index.html.hbs --- templates/index.html.hbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/index.html.hbs b/templates/index.html.hbs index be21e05..8f24098 100644 --- a/templates/index.html.hbs +++ b/templates/index.html.hbs @@ -5,6 +5,7 @@ + Test @@ -190,4 +191,4 @@ crossorigin="anonymous"> - \ No newline at end of file + From 6b336c5a796566c0dd956ab41929757195f303fc Mon Sep 17 00:00:00 2001 From: RaspberryProgramming Date: Wed, 17 Jul 2024 21:05:54 +0000 Subject: [PATCH 3/6] Revert "Update index.html.hbs" This reverts commit e3de72572500247b31bb672f74a5b09c8a56266d. --- templates/index.html.hbs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/index.html.hbs b/templates/index.html.hbs index 8f24098..be21e05 100644 --- a/templates/index.html.hbs +++ b/templates/index.html.hbs @@ -5,7 +5,6 @@ - Test @@ -191,4 +190,4 @@ crossorigin="anonymous"> - + \ No newline at end of file From 0fef9757bb6955a36612e1e7224370ad72216fbc Mon Sep 17 00:00:00 2001 From: RaspberryProgramming Date: Wed, 17 Jul 2024 23:55:12 +0000 Subject: [PATCH 4/6] Added page titles --- templates/error.html.hbs | 1 + templates/history.html.hbs | 2 +- templates/index.html.hbs | 1 + templates/ownership_registration.html.hbs | 2 +- templates/request_details.html.hbs | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/templates/error.html.hbs b/templates/error.html.hbs index 5ebb631..41c5872 100644 --- a/templates/error.html.hbs +++ b/templates/error.html.hbs @@ -5,6 +5,7 @@ + Request Mirror - Error diff --git a/templates/history.html.hbs b/templates/history.html.hbs index 8a13434..eb63ce6 100644 --- a/templates/history.html.hbs +++ b/templates/history.html.hbs @@ -3,9 +3,9 @@ - + Request Mirror - History diff --git a/templates/index.html.hbs b/templates/index.html.hbs index be21e05..3b503e3 100644 --- a/templates/index.html.hbs +++ b/templates/index.html.hbs @@ -5,6 +5,7 @@ + Request Mirror - Home diff --git a/templates/ownership_registration.html.hbs b/templates/ownership_registration.html.hbs index c4271e0..4fd2f21 100644 --- a/templates/ownership_registration.html.hbs +++ b/templates/ownership_registration.html.hbs @@ -3,9 +3,9 @@ - + Request Mirror - Ownership Registration diff --git a/templates/request_details.html.hbs b/templates/request_details.html.hbs index f1a9cd7..77bf6e9 100644 --- a/templates/request_details.html.hbs +++ b/templates/request_details.html.hbs @@ -5,6 +5,7 @@ + Request Mirror - Request Details From 8e0e516a7d07b5bdc8c5f31fc1372291da40a0ec Mon Sep 17 00:00:00 2001 From: Camerin Figueroa Date: Wed, 17 Jul 2024 20:02:52 -0400 Subject: [PATCH 5/6] Update docker-test.yml removed on trigger for test pr's --- .github/workflows/docker-test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index dfee01b..338d4a9 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -3,8 +3,6 @@ name: Build and Publish Test Docker Image on: push: branches: [ "test"] - pull_request: - branches: [ "test" ] jobs: From c81d7df97f58bcff513bbcae6ebaea9dbeb41810 Mon Sep 17 00:00:00 2001 From: Camerin Figueroa Date: Wed, 17 Jul 2024 20:05:03 -0400 Subject: [PATCH 6/6] Update docker-test.yml --- .github/workflows/docker-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index 338d4a9..8555747 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -3,7 +3,8 @@ name: Build and Publish Test Docker Image on: push: branches: [ "test"] - + pull_request: + branches: [ "test" ] jobs: build: