From 566c287501ad083edc465212b6f69fa270169256 Mon Sep 17 00:00:00 2001 From: Isa Ozler <1378630+isaozler@users.noreply.github.com> Date: Wed, 23 Oct 2024 10:57:01 +0200 Subject: [PATCH] adding github sponsor link (#41) * adding github sponsor link * docker-compose refactored * update config files --- .github/FUNDING.yml | 1 + .github/workflows/ci.yml | 27 ++++++++++++++++++--------- .github/workflows/is-compatible.yml | 6 +++--- 3 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..bdb5475 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: isaozler diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfe37f6..85e17a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,9 +12,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '18' cache: 'npm' @@ -31,14 +31,23 @@ jobs: - name: Build frontend run: npm run build - - name: Start grafana docker - run: docker-compose up -d + - name: Start Grafana Docker container + run: | + docker network create grafana-network || true + docker run -d \ + --name=grafana \ + --network=grafana-network \ + -p 3000:3000 \ + grafana/grafana - name: Run e2e tests run: npm run e2e - - name: Stop grafana docker - run: docker-compose down + - name: Stop and remove Grafana Docker container + run: | + docker stop grafana + docker rm grafana + docker network rm grafana-network - name: Check for backend id: check-for-backend @@ -50,20 +59,20 @@ jobs: - name: Setup Go environment if: steps.check-for-backend.outputs.has-backend == 'true' - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: '1.19' - name: Test backend if: steps.check-for-backend.outputs.has-backend == 'true' - uses: magefile/mage-action@v2 + uses: magefile/mage-action@v3 with: version: latest args: coverage - name: Build backend if: steps.check-for-backend.outputs.has-backend == 'true' - uses: magefile/mage-action@v2 + uses: magefile/mage-action@v3 with: version: latest args: buildAll diff --git a/.github/workflows/is-compatible.yml b/.github/workflows/is-compatible.yml index a978a45..f90a3b4 100644 --- a/.github/workflows/is-compatible.yml +++ b/.github/workflows/is-compatible.yml @@ -5,11 +5,11 @@ jobs: compatibilitycheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: '16' + node-version: '18' cache: 'npm' - name: Install dependencies run: npm ci