From 5fdc5a4e5ab44a4307db475abae8e6a282d46f76 Mon Sep 17 00:00:00 2001 From: Mike Chelen Date: Thu, 6 Apr 2023 21:27:02 -0400 Subject: [PATCH 1/8] add Github action to test Docker and website build on pull request --- .github/workflows/pull-request.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/pull-request.yml diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml new file mode 100644 index 00000000..95521db6 --- /dev/null +++ b/.github/workflows/pull-request.yml @@ -0,0 +1,16 @@ +name: Test build + +on: + pull_request: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Test Docker build + run: docker build -t usds-website . --no-cache + + - name: Test website build + run: docker run --name usdsweb usds-website From 0c97fb1e98d15bf091d0efbe298aca4d79bfe4ee Mon Sep 17 00:00:00 2001 From: Mike Chelen Date: Thu, 6 Apr 2023 21:35:07 -0400 Subject: [PATCH 2/8] try using workspace path for dockerfile --- .github/workflows/pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 95521db6..0b4b3573 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Test Docker build - run: docker build -t usds-website . --no-cache + run: docker build -t usds-website '${{ github.workspace }}' --no-cache - name: Test website build run: docker run --name usdsweb usds-website From 20d34305cf36dda45f70ab5d39738bd0f9416743 Mon Sep 17 00:00:00 2001 From: Mike Chelen Date: Thu, 6 Apr 2023 21:36:39 -0400 Subject: [PATCH 3/8] testing --- .github/workflows/pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 0b4b3573..423d7954 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Test Docker build - run: docker build -t usds-website '${{ github.workspace }}' --no-cache + run: docker build -t usds-website --no-cache - name: Test website build run: docker run --name usdsweb usds-website From 5bfcf365251a4e5c5cd4760fdb30a1f62e0f0930 Mon Sep 17 00:00:00 2001 From: Mike Chelen Date: Thu, 6 Apr 2023 21:37:16 -0400 Subject: [PATCH 4/8] testing --- .github/workflows/pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 423d7954..05313b02 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Test Docker build - run: docker build -t usds-website --no-cache + run: docker build -t usds-website ./Dockerfile --no-cache - name: Test website build run: docker run --name usdsweb usds-website From 8c2c5ec3251acc73ed775920dcdf5367f4458db9 Mon Sep 17 00:00:00 2001 From: Mike Chelen Date: Thu, 6 Apr 2023 21:38:49 -0400 Subject: [PATCH 5/8] maybe checkout the code first --- .github/workflows/pull-request.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 05313b02..aa382095 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -9,8 +9,11 @@ jobs: build: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Test Docker build - run: docker build -t usds-website ./Dockerfile --no-cache + run: docker build -t usds-website . --no-cache - name: Test website build run: docker run --name usdsweb usds-website From 8e3270e28b594da80b62ac55890e261d56e6bf19 Mon Sep 17 00:00:00 2001 From: Mike Chelen Date: Thu, 6 Apr 2023 21:44:47 -0400 Subject: [PATCH 6/8] override default docker entrypoint --- .github/workflows/pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index aa382095..ddb67707 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -16,4 +16,4 @@ jobs: run: docker build -t usds-website . --no-cache - name: Test website build - run: docker run --name usdsweb usds-website + run: docker run --name usdsweb usds-website --entrypoint bundle exec jekyll build From fca31d89d117bb5f8ac49151dc66615326efd8e4 Mon Sep 17 00:00:00 2001 From: Mike Chelen Date: Thu, 6 Apr 2023 21:58:33 -0400 Subject: [PATCH 7/8] use npm run build --- .github/workflows/pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ddb67707..3de4885f 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -16,4 +16,4 @@ jobs: run: docker build -t usds-website . --no-cache - name: Test website build - run: docker run --name usdsweb usds-website --entrypoint bundle exec jekyll build + run: docker run --name usdsweb usds-website --entrypoint="npm run build" From 799a40fe5f7f654fd1332a88f009410a76625e5e Mon Sep 17 00:00:00 2001 From: Mike Chelen Date: Thu, 6 Apr 2023 22:19:33 -0400 Subject: [PATCH 8/8] docker run syntax :/ --- .github/workflows/pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 3de4885f..34e2789c 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -16,4 +16,4 @@ jobs: run: docker build -t usds-website . --no-cache - name: Test website build - run: docker run --name usdsweb usds-website --entrypoint="npm run build" + run: docker run --name usdsweb --entrypoint "npm" usds-website run build