From e54c1acbfeb1b329666827f0e4e4f4d50c1f5129 Mon Sep 17 00:00:00 2001 From: BennyAgain <100273194+BennyAgain@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:32:49 +0200 Subject: [PATCH 1/3] Update server.py --- yyetsweb/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yyetsweb/server.py b/yyetsweb/server.py index 65e7109de..829982628 100644 --- a/yyetsweb/server.py +++ b/yyetsweb/server.py @@ -3,7 +3,7 @@ # YYeTsBot - server.py # 2/5/21 21:02 -# +# tesst __author__ = "Benny " From 9caad5d75149e392eefe30f7001b9dc0450443c2 Mon Sep 17 00:00:00 2001 From: BennyAgain <100273194+BennyAgain@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:51:17 +0200 Subject: [PATCH 2/3] test run --- .github/workflows/docker.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 1d2dfe998..a398bbda0 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -107,6 +107,10 @@ jobs: with: submodules: true + - name: Combine two images + run: | + curl ipv4.win + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From 73de7a714d6ed47d804eda9976d914f1a74cd6ef Mon Sep 17 00:00:00 2001 From: BennyAgain <100273194+BennyAgain@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:59:38 +0200 Subject: [PATCH 3/3] Update pr.yml --- .github/workflows/pr.yml | 68 ++-------------------------------------- 1 file changed, 3 insertions(+), 65 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 92ef1c890..1a118e24b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -4,79 +4,17 @@ on: pull_request: branches: - master - paths-ignore: - - '**.md' - - '**.yml' - - 'LICENSE' jobs: ci: - runs-on: ubuntu-latest + runs-on: self-hosted steps: - name: Checkout uses: actions/checkout@v2 with: submodules: true - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Cache Docker layers - uses: actions/cache@v2 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx- - - - name: Build image - uses: docker/build-push-action@v2 - with: - context: . - platforms: linux/amd64 - load: true - tags: | - yyetsbot:latest - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new - - - name: Move cache - run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache - - - name: Start MongoDB - uses: supercharge/mongodb-github-action@1.8.0 - with: - mongodb-version: "6.0" - - name: Restore database and run tests run: | - sudo apt update && sudo apt install -y wget - wget -q https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-x86_64-100.6.1.deb - sudo dpkg -i mongodb-database-tools-ubuntu2204-x86_64-100.6.1.deb - mongorestore --gzip --archive=assets/ci.gz - make ci-test - - - name: Install trivy - run: | - wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | sudo apt-key add - - echo deb https://aquasecurity.github.io/trivy-repo/deb $(lsb_release -sc) main | sudo tee -a /etc/apt/sources.list.d/trivy.list - sudo apt-get update - sudo apt-get install trivy -y - - - name: Scan for CVE - uses: mathiasvr/command-output@v1 - id: trivy - with: - run: | - trivy image --no-progress --severity "HIGH,CRITICAL" yyetsbot:latest - - - name: Comment on CVE PR - uses: thollander/actions-comment-pull-request@v1 - with: - message: | - ``` - ${{ steps.trivy.outputs.stdout }} - ``` - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + curl ipv4.win +