From 7c4e491d18f3a4999b6c1b7c852f6892756d1db8 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 16:38:47 +0200 Subject: [.github/feature-branch] Fixed bad static analysis name --- .github/workflows/feature-branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml index 54c0c6b..86b7cfd 100644 --- a/.github/workflows/feature-branch.yml +++ b/.github/workflows/feature-branch.yml @@ -26,7 +26,7 @@ jobs: - name: Build server and browser run: make tests - Static analysis: + Static-analysis: runs-on: ubuntu-latest needs: Clone-repo steps: -- cgit v1.2.3 From d0d2937c42304b9e2805ac0ba8bd1bc2b2d7604c Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 17:39:45 +0200 Subject: [.github/feature-branch] Reworked to properly use clone repo artifact --- .github/workflows/feature-branch.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml index 86b7cfd..c7ab192 100644 --- a/.github/workflows/feature-branch.yml +++ b/.github/workflows/feature-branch.yml @@ -1,4 +1,4 @@ -name: feature-branch +name: Tests and static analysis on: push: branches-ignore: @@ -22,7 +22,10 @@ jobs: runs-on: ubuntu-latest needs: Clone-repo steps: - - uses: actions/checkout@v4 + - uses: actions/download-artifact@v3 + with: + name: source-code + path: . - name: Build server and browser run: make tests @@ -30,7 +33,9 @@ jobs: runs-on: ubuntu-latest needs: Clone-repo steps: - - uses: actions/checkout@v4 + - uses: actions/download-artifact@v3 + with: + name: source-code + path: . - name: Build server and browser run: make static-analysis - -- cgit v1.2.3 From 74609c69efefe6660f0befb89928787fdceaa0ae Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 17:40:00 +0200 Subject: [.github/dev-branch] Added initial setup --- .github/workflows/dev-branch.yml | 85 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 .github/workflows/dev-branch.yml (limited to '.github/workflows') diff --git a/.github/workflows/dev-branch.yml b/.github/workflows/dev-branch.yml new file mode 100644 index 0000000..ba2853d --- /dev/null +++ b/.github/workflows/dev-branch.yml @@ -0,0 +1,85 @@ +name: Tests and static analysis +on: + push: + branches: + - dev +jobs: + # This is done to prevent potential race conditions; + # multiple jobs start with the source code, but since + # they have no "needs", one could start a little bit later, + # and in meantime a commit could be pushed + Clone-repo: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/upload-artifact@v3 + with: + name: source-code + path: . + + Tests: + runs-on: ubuntu-latest + needs: Clone-repo + steps: + - uses: actions/download-artifact@v3 + with: + name: source-code + path: . + - name: Run tests + run: make tests + + Static-analysis: + runs-on: ubuntu-latest + needs: Clone-repo + steps: + - uses: actions/download-artifact@v3 + with: + name: source-code + path: . + - name: Run satic analysis + run: make static-analysis + + Security-analysis: + runs-on: ubuntu-latest + needs: Clone-repo + steps: + - uses: actions/download-artifact@v3 + with: + name: source-code + path: . + - name: Run security analysis + run: make security-analysis + + Build: + runs-on: ubuntu-latest + needs: [ Tests, Static-analysis, Security-analysis ] + steps: + - uses: actions/download-artifact@v3 + with: + name: source-code + path: . + - name: Build server and browser + run: make dev + - uses: actions/upload-artifact@v3 + with: + name: dev-build-files + path: ./build + + Build-docker-and-push: + name: Build the docker container image and push it to dockerhub + runs-on: ubuntu-latest + steps: + - uses: actions/download-artifact@v3 + with: + name: dev-build-files + path: ./build + - uses: actions/checkout@v4 + - uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - uses: docker/build-push-action@v5 + with: + push: true + file: Dockerfile.dev + tags: ${{ secrets.DOCKERHUB_USERNAME }}/pico-web-dev:latest -- cgit v1.2.3 From 772c600775ebd86a9fc8fc958b79a3e483ffc4f4 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 17:48:04 +0200 Subject: [.github/main-branch] Added a github release step --- .github/workflows/main-branch.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/main-branch.yml b/.github/workflows/main-branch.yml index d8584cb..dcd4c60 100644 --- a/.github/workflows/main-branch.yml +++ b/.github/workflows/main-branch.yml @@ -1,10 +1,10 @@ -name: Push image to dockerhub +name: Create release and push production server image to dockerhub on: push: branches: - main jobs: - build-and-push: + Build-docker-and-push: name: Build the docker container image and push it to dockerhub runs-on: ubuntu-latest steps: @@ -18,3 +18,14 @@ jobs: push: true tags: ${{ secrets.DOCKERHUB_USERNAME }}/pico-web-server:latest + Release: + name: Make github release + runs-on: ubuntu-latest + needs: Build-docker-and-push + steps: + - uses: actions/checkout@v4 + - uses: rymndhng/release-on-push-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + bump_version_scheme: minor -- cgit v1.2.3 From a71a9c37a765cde78f0085b4c21adeedb6fd819f Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 17:48:26 +0200 Subject: [.github/dev-branch] Slight name rename --- .github/workflows/dev-branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/dev-branch.yml b/.github/workflows/dev-branch.yml index ba2853d..a7e81f6 100644 --- a/.github/workflows/dev-branch.yml +++ b/.github/workflows/dev-branch.yml @@ -1,4 +1,4 @@ -name: Tests and static analysis +name: Tests, analysis and push to dev dockerhub on: push: branches: -- cgit v1.2.3 From b32fc727fdbd67e9395cedb0a13f1a2adc03d527 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 17:55:36 +0200 Subject: [.github/feature-branch] Fixed names of steps --- .github/workflows/feature-branch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml index c7ab192..88bee04 100644 --- a/.github/workflows/feature-branch.yml +++ b/.github/workflows/feature-branch.yml @@ -26,7 +26,7 @@ jobs: with: name: source-code path: . - - name: Build server and browser + - name: Run tests run: make tests Static-analysis: @@ -37,5 +37,5 @@ jobs: with: name: source-code path: . - - name: Build server and browser + - name: Run static analysis run: make static-analysis -- cgit v1.2.3 From fe29a3630d48d3e1d44287ea41682621d3a3dab0 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 17:59:38 +0200 Subject: [.github] Recursive submodule checkout --- .github/workflows/dev-branch.yml | 2 ++ .github/workflows/feature-branch.yml | 2 ++ .github/workflows/main-branch.yml | 2 ++ 3 files changed, 6 insertions(+) (limited to '.github/workflows') diff --git a/.github/workflows/dev-branch.yml b/.github/workflows/dev-branch.yml index a7e81f6..6d66da2 100644 --- a/.github/workflows/dev-branch.yml +++ b/.github/workflows/dev-branch.yml @@ -12,6 +12,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + submodules: recursive - uses: actions/upload-artifact@v3 with: name: source-code diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml index 88bee04..3ff1833 100644 --- a/.github/workflows/feature-branch.yml +++ b/.github/workflows/feature-branch.yml @@ -13,6 +13,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + submodules: recursive - uses: actions/upload-artifact@v3 with: name: source-code diff --git a/.github/workflows/main-branch.yml b/.github/workflows/main-branch.yml index dcd4c60..8534344 100644 --- a/.github/workflows/main-branch.yml +++ b/.github/workflows/main-branch.yml @@ -9,6 +9,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + submodules: recursive - uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} -- cgit v1.2.3 From 13446ebece8d11145f578e8f6dfd488dae929ed6 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 19:01:28 +0200 Subject: [workflows/dev-branch] Fixed missing needs for build docker --- .github/workflows/dev-branch.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github/workflows') diff --git a/.github/workflows/dev-branch.yml b/.github/workflows/dev-branch.yml index 6d66da2..f0342b6 100644 --- a/.github/workflows/dev-branch.yml +++ b/.github/workflows/dev-branch.yml @@ -70,6 +70,7 @@ jobs: Build-docker-and-push: name: Build the docker container image and push it to dockerhub runs-on: ubuntu-latest + needs: Build steps: - uses: actions/download-artifact@v3 with: -- cgit v1.2.3 From 1439b1132c3b01367b33298e21c1356f68295124 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 19:05:30 +0200 Subject: [.github/dev-branch] Install flawfinder --- .github/workflows/dev-branch.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github/workflows') diff --git a/.github/workflows/dev-branch.yml b/.github/workflows/dev-branch.yml index f0342b6..8fda115 100644 --- a/.github/workflows/dev-branch.yml +++ b/.github/workflows/dev-branch.yml @@ -49,6 +49,7 @@ jobs: with: name: source-code path: . + - run: sudo apt-get install -y flawfinder - name: Run security analysis run: make security-analysis -- cgit v1.2.3 From 87581b1bcb25083d3cb047c70fa9cf30b62a4f4e Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 19:19:13 +0200 Subject: [.github/dev-branch] Skipped unnecessary checkout action --- .github/workflows/dev-branch.yml | 1 - 1 file changed, 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/dev-branch.yml b/.github/workflows/dev-branch.yml index 8fda115..51970df 100644 --- a/.github/workflows/dev-branch.yml +++ b/.github/workflows/dev-branch.yml @@ -77,7 +77,6 @@ jobs: with: name: dev-build-files path: ./build - - uses: actions/checkout@v4 - uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} -- cgit v1.2.3 From 9205cd150c7abeb0f73d54923848d08e940d9f23 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 19:19:26 +0200 Subject: [.github/main-branch] Updated github token name --- .github/workflows/main-branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/main-branch.yml b/.github/workflows/main-branch.yml index 8534344..f19976d 100644 --- a/.github/workflows/main-branch.yml +++ b/.github/workflows/main-branch.yml @@ -28,6 +28,6 @@ jobs: - uses: actions/checkout@v4 - uses: rymndhng/release-on-push-action@master env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.TOKEN_GITHUB }} with: bump_version_scheme: minor -- cgit v1.2.3 From de79209e0a3064a9344298ec9dd74a3f3ec00bb0 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 19:27:55 +0200 Subject: [.github/dev-branch] Testing tree --- .github/workflows/dev-branch.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github/workflows') diff --git a/.github/workflows/dev-branch.yml b/.github/workflows/dev-branch.yml index 51970df..202b0b9 100644 --- a/.github/workflows/dev-branch.yml +++ b/.github/workflows/dev-branch.yml @@ -77,6 +77,7 @@ jobs: with: name: dev-build-files path: ./build + - run: tree - uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} -- cgit v1.2.3 From 385e470efbce623be31889db5d6ed959fc4fa000 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 19:41:10 +0200 Subject: [.github/dev-branch] Fixed build file dir --- .github/workflows/dev-branch.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/dev-branch.yml b/.github/workflows/dev-branch.yml index 202b0b9..f36f2e3 100644 --- a/.github/workflows/dev-branch.yml +++ b/.github/workflows/dev-branch.yml @@ -76,8 +76,7 @@ jobs: - uses: actions/download-artifact@v3 with: name: dev-build-files - path: ./build - - run: tree + path: /build - uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} -- cgit v1.2.3 From edf1db552541001924cd80f099aaa05fb2b07edb Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 19:46:44 +0200 Subject: [.github/dev-branch] Fixed build folder permissions --- .github/workflows/dev-branch.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/dev-branch.yml b/.github/workflows/dev-branch.yml index f36f2e3..33172b0 100644 --- a/.github/workflows/dev-branch.yml +++ b/.github/workflows/dev-branch.yml @@ -76,7 +76,8 @@ jobs: - uses: actions/download-artifact@v3 with: name: dev-build-files - path: /build + path: ./build + - run: sudo mv ./build /build - uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} -- cgit v1.2.3 From 9fd9dd81a897e47158048c1a7a920747c0133a70 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 19:58:06 +0200 Subject: [.github/dev-branch] Manual checkout and local context --- .github/workflows/dev-branch.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.github/workflows') diff --git a/.github/workflows/dev-branch.yml b/.github/workflows/dev-branch.yml index 33172b0..c3569a8 100644 --- a/.github/workflows/dev-branch.yml +++ b/.github/workflows/dev-branch.yml @@ -82,8 +82,10 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - uses: actions/checkout@v4 - uses: docker/build-push-action@v5 with: push: true + context: . file: Dockerfile.dev tags: ${{ secrets.DOCKERHUB_USERNAME }}/pico-web-dev:latest -- cgit v1.2.3 From fe3e25494bd4472f40e843f75463d49316ff2585 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 20:05:33 +0200 Subject: [.github/dev-branch] Fixed download artifact logic --- .github/workflows/dev-branch.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/dev-branch.yml b/.github/workflows/dev-branch.yml index c3569a8..95d580a 100644 --- a/.github/workflows/dev-branch.yml +++ b/.github/workflows/dev-branch.yml @@ -73,16 +73,15 @@ jobs: runs-on: ubuntu-latest needs: Build steps: + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: name: dev-build-files path: ./build - - run: sudo mv ./build /build - uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - uses: actions/checkout@v4 - uses: docker/build-push-action@v5 with: push: true -- cgit v1.2.3