Skip to content

Drop multi-arch from reusable sonar workflows #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cmillett wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Drop multi-arch from reusable sonar workflows #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 2 additions & 67 deletions .github/workflows/sonar_docker_deployer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ on:
default: ''
required: false
type: string
multi_arch:
description: 'Enable multi-architecture builds (amd64 + arm64)'
default: false
required: false
type: boolean
secrets:
helper_token:
required: true
Expand All @@ -39,18 +34,14 @@ on:

jobs:
deploy_actions:
strategy:
matrix:
include: ${{ fromJson(inputs.multi_arch && '[{"runner":"ubuntu-24.04","arch":"amd64"},{"runner":"ubuntu-24.04-arm","arch":"arm64"}]' || '[{"runner":"ubuntu-24.04","arch":"amd64"}]') }}
runs-on: ${{ matrix.runner }}
name: Deploy Docker${{ inputs.multi_arch && format(' ({0})', matrix.arch) || '' }}
runs-on: ubuntu-24.04-arm
name: Deploy Docker
env:
docker_password: ${{ secrets.dockerhub_ro_token }}
TERM: xterm-256color
FORCE_COLOR: 2
DOCKER_BUILDKIT: 1
BUILDX_NO_DEFAULT_ATTESTATIONS: 1
ARCH_SUFFIX: ${{ inputs.multi_arch && format('-{0}', matrix.arch) || '' }}
steps:
- name: Login to Docker Hub
if: ${{ env.docker_password }}
Expand Down Expand Up @@ -83,12 +74,10 @@ jobs:
cache_aws_key_id: ${{ secrets.cache_aws_key_id }}
cache_aws_key: ${{ secrets.cache_aws_key }}
- name: Deploy Develop
if: matrix.arch == 'amd64' && !inputs.multi_arch
uses: ./helper/.github/actions/deploy
with:
leela_token: ${{ secrets.leela_token }}
- name: Restore code coverage cache
if: matrix.arch == 'amd64'
uses: ./helper/.github/actions/cache
with:
restore: "true"
Expand All @@ -97,61 +86,7 @@ jobs:
cache_aws_key_id: ${{ secrets.cache_aws_key_id }}
cache_aws_key: ${{ secrets.cache_aws_key }}
- name: SonarCloud Scan
if: matrix.arch == 'amd64'
uses: SonarSource/sonarqube-scan-action@master
env:
GITHUB_TOKEN: ${{ secrets.helper_token }}
SONAR_TOKEN: ${{ secrets.sonar_token}}

create_release_manifest:
if: inputs.multi_arch
needs: deploy_actions
runs-on: ubuntu-24.04
name: Create multi-arch release manifest
env:
docker_password: ${{ secrets.dockerhub_ro_token }}
TERM: xterm-256color
FORCE_COLOR: 2
steps:
- name: Login to Docker Hub
if: ${{ env.docker_password }}
uses: docker/login-action@v3
with:
username: "woosmap"
password: ${{ secrets.dockerhub_ro_token }}
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: Woosmap/.github/.github/actions/checkout_build_helper@master
with:
helper_token: ${{ secrets.helper_token }}
build_helper_branch: ${{ inputs.build_helper_branch }}
- name: Login to AWS ECR
uses: docker/login-action@v3
with:
registry: ${{ secrets.aws_account }}.dkr.ecr.us-east-1.amazonaws.com
username: ${{ secrets.aws_key_id }}
password: ${{ secrets.aws_key }}
- name: Create Release Manifest
uses: ./helper/.github/actions/create_release_manifest

deploy_develop:
if: inputs.multi_arch
needs: create_release_manifest
runs-on: ubuntu-24.04
name: Deploy develop
env:
TERM: xterm-256color
FORCE_COLOR: 2
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: Woosmap/.github/.github/actions/checkout_build_helper@master
with:
helper_token: ${{ secrets.helper_token }}
build_helper_branch: ${{ inputs.build_helper_branch }}
- name: Deploy Develop
uses: ./helper/.github/actions/deploy
with:
leela_token: ${{ secrets.leela_token }}
77 changes: 2 additions & 75 deletions .github/workflows/sonar_python_bender_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ on:
default: false
required: false
type: boolean
multi_arch:
description: 'Enable multi-architecture builds (amd64 + arm64)'
default: false
required: false
type: boolean
secrets:
helper_token:
required: true
Expand Down Expand Up @@ -52,19 +47,15 @@ jobs:
if: |
(github.event_name == 'pull_request' && github.actor != 'dependabot[bot]') ||
(github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]')
strategy:
matrix:
include: ${{ fromJson(inputs.multi_arch && '[{"runner":"ubuntu-24.04","arch":"amd64"},{"runner":"ubuntu-24.04-arm","arch":"arm64"}]' || '[{"runner":"ubuntu-24.04","arch":"amd64"}]') }}
runs-on: ${{ matrix.runner }}
name: Build, Test, Sonar, Publish${{ inputs.multi_arch && format(' ({0})', matrix.arch) || '' }}
runs-on: ubuntu-24.04-arm
name: Build, Test, Sonar, Publish
env:
is_reco: ${{ secrets.maxmind }}
docker_password: ${{ secrets.dockerhub_ro_token }}
TERM: xterm-256color
FORCE_COLOR: 2
DOCKER_BUILDKIT: 1
BUILDX_NO_DEFAULT_ATTESTATIONS: 1
ARCH_SUFFIX: ${{ inputs.multi_arch && format('-{0}', matrix.arch) || '' }}
steps:
- name: Login to Docker Hub
if: ${{ env.docker_password }}
Expand Down Expand Up @@ -100,20 +91,17 @@ jobs:
env:
MAXMIND: ${{ secrets.maxmind }}
- name: Bender Test
if: matrix.arch == 'amd64'
uses: ./helper/.github/actions/run_tests
- name: Bender Build
uses: ./helper/.github/actions/builder
- name: Cache code coverage
if: matrix.arch == 'amd64'
uses: ./helper/.github/actions/cache
with:
path: "./coverage/coverage.xml"
key: "coverage"
cache_aws_key_id: ${{ secrets.cache_aws_key_id }}
cache_aws_key: ${{ secrets.cache_aws_key }}
- name: SonarCloud Scan
if: matrix.arch == 'amd64'
uses: SonarSource/sonarqube-scan-action@master
env:
GITHUB_TOKEN: ${{ secrets.helper_token }}
Expand All @@ -125,67 +113,6 @@ jobs:
- name: Publish
uses: ./helper/.github/actions/publish
- name: PR Deploy
if: matrix.arch == 'amd64' && !inputs.multi_arch
uses: ./helper/.github/actions/deploy
with:
pr_deploy: "true"
leela_token: ${{ secrets.leela_token }}

create_manifest:
if: |
inputs.multi_arch &&
((github.event_name == 'pull_request' && github.actor != 'dependabot[bot]') ||
(github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'))
needs: test_actions
runs-on: ubuntu-24.04
name: Create multi-arch manifest
env:
docker_password: ${{ secrets.dockerhub_ro_token }}
TERM: xterm-256color
FORCE_COLOR: 2
steps:
- name: Login to Docker Hub
if: ${{ env.docker_password }}
uses: docker/login-action@v3
with:
username: "woosmap"
password: ${{ secrets.dockerhub_ro_token }}
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: Woosmap/.github/.github/actions/checkout_build_helper@master
with:
helper_token: ${{ secrets.helper_token }}
build_helper_branch: ${{ inputs.build_helper_branch }}
- name: Login to AWS ECR
uses: docker/login-action@v3
with:
registry: ${{ secrets.aws_account }}.dkr.ecr.us-east-1.amazonaws.com
username: ${{ secrets.aws_key_id }}
password: ${{ secrets.aws_key }}
- name: Create Manifest
uses: ./helper/.github/actions/create_manifest

pr_deploy:
if: |
inputs.multi_arch &&
((github.event_name == 'pull_request' && github.actor != 'dependabot[bot]') ||
(github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'))
needs: create_manifest
runs-on: ubuntu-24.04
name: Deploy PR to develop
env:
TERM: xterm-256color
FORCE_COLOR: 2
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: Woosmap/.github/.github/actions/checkout_build_helper@master
with:
helper_token: ${{ secrets.helper_token }}
build_helper_branch: ${{ inputs.build_helper_branch }}
- name: Deploy PR
uses: ./helper/.github/actions/deploy
with:
pr_deploy: "true"
Expand Down