diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 6ea9bd02..7ea35942 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -3,7 +3,7 @@ name: Python Linter (Black) on: [push, pull_request] jobs: - lint: + lint-backend: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/build_docker.dev.yml b/.github/workflows/build_docker.dev.yml index b643b65d..43274ad2 100644 --- a/.github/workflows/build_docker.dev.yml +++ b/.github/workflows/build_docker.dev.yml @@ -6,7 +6,7 @@ on: - "dev" jobs: - docker: + build-docker-dev: runs-on: ubuntu-latest steps: - name: Set up QEMU @@ -18,11 +18,11 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push + - name: Build and Push id: docker_build uses: docker/build-push-action@v3 with: file: docker/Dockerfile platforms: linux/amd64 push: true - tags: membermatters/membermatters:dev + tags: membermatters/membermatters:dev,membermatters/membermatters:${{github.sha}} diff --git a/.github/workflows/build_docker.pr.yml b/.github/workflows/build_docker.pr.yml new file mode 100644 index 00000000..1ba3d379 --- /dev/null +++ b/.github/workflows/build_docker.pr.yml @@ -0,0 +1,27 @@ +name: Build Docker Image (DEV Branch) + +on: + pull_request: + branches: + - "dev" + +jobs: + build-docker-pr: + runs-on: ubuntu-latest + steps: + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build Docker Image + id: docker_build + uses: docker/build-push-action@v3 + with: + file: docker/Dockerfile + platforms: linux/amd64 + push: false diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.release.yml similarity index 97% rename from .github/workflows/build_docker.yml rename to .github/workflows/build_docker.release.yml index 7c1f88f4..1f11ae30 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.release.yml @@ -7,7 +7,7 @@ on: - "!v[0-9]+.[0-9]+.[0-9]+-*" jobs: - docker: + build-docker-release: runs-on: ubuntu-latest steps: - name: Set up QEMU diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 86e8bbd8..8368fb1b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,12 +13,12 @@ name: "CodeQL" on: push: - branches: [ main, dev ] + branches: + - "dev" pull_request: # The branches below must be a subset of the branches above - branches: [ main, dev ] - schedule: - - cron: '36 19 * * 4' + branches: + - "dev" jobs: analyze: @@ -28,40 +28,40 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'javascript', 'python' ] + language: ["javascript", "python"] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] # Learn more: # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed steps: - - name: Checkout repository - uses: actions/checkout@v2 + - name: Checkout repository + uses: actions/checkout@v2 - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v1 - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language - #- run: | - # make bootstrap - # make release + #- run: | + # make bootstrap + # make release - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml index 4917e58d..34dc5437 100644 --- a/.github/workflows/eslint.yml +++ b/.github/workflows/eslint.yml @@ -1,7 +1,7 @@ name: JavaScript Linter (eslint) on: [push, pull_request] jobs: - build: + lint-frontend: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3