Skip to content

Commit

Permalink
Merge pull request #8 from greenbone/test_ci_with_new_registry
Browse files Browse the repository at this point in the history
Change: Use new registry ghcr.io
  • Loading branch information
hd-gb authored Mar 14, 2024
2 parents 9b5d227 + 3737e5c commit 085e645
Show file tree
Hide file tree
Showing 9 changed files with 77 additions and 1 deletion.
6 changes: 6 additions & 0 deletions .github/actions/autopkgtest/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ inputs:
runs:
using: "composite"
steps:
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ env.GITHUB_TOKEN }}
- run: |
docker run --pull always --privileged --rm -v ${{ env.CI_PROJECT_DIR }}:/__w -e WORKING_DIR="/__w" --workdir /__w ${{ inputs.registry }}/${{ inputs.arch }}/autopkgtest:${{ inputs.debian_release_name }}
shell: bash
6 changes: 6 additions & 0 deletions .github/actions/blhc/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ inputs:
runs:
using: "composite"
steps:
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ env.GITHUB_TOKEN }}
- run: |
docker run --pull always --rm -v ${{ env.CI_PROJECT_DIR }}:/__w --workdir /__w -e WORKING_DIR="/__w/debian/output" ${{ inputs.registry }}/${{ inputs.arch }}/blhc:${{ inputs.debian_release_name }}
shell: bash
8 changes: 8 additions & 0 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ inputs:
runs:
using: "composite"
steps:
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ env.GITHUB_TOKEN }}
- id: build_docker
run: |
docker run \
Expand All @@ -30,5 +36,7 @@ runs:
-e WORKING_DIR="${{ env.WORKING_DIR }}" \
-e CI_PROJECT_DIR="${{ env.CI_PROJECT_DIR }}" \
-e TOKEN="${{ env.TOKEN }}" \
-e GITHUB_TOKEN="${{ env.GITHUB_TOKEN }}" \
-e GITHUB_ACTOR="${{ github.actor }}" \
${{ inputs.registry }}/${{ inputs.arch }}/gbp:${{ inputs.debian_release_name }}
shell: bash
6 changes: 6 additions & 0 deletions .github/actions/clean/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ inputs:
runs:
using: "composite"
steps:
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ env.GITHUB_TOKEN }}
- run: |
docker run --rm -v ${{ env.CI_PROJECT_DIR }}:/__w -e GOS_REPOSITORY_HOST="${{ inputs.host }}" -e GOS_REPOSITORY_KEY="${{ inputs.key }}" -e WORKING_DIR="/__w" --workdir /__w ${{ inputs.registry }}/${{ inputs.arch }}/repository:bookworm /action.sh --clean
shell: bash
6 changes: 6 additions & 0 deletions .github/actions/lintian/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ inputs:
runs:
using: "composite"
steps:
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ env.GITHUB_TOKEN }}
- run: |
docker run --pull always --rm -v ${{ env.CI_PROJECT_DIR }}:/__w --workdir /__w -e WORKING_DIR="/__w/debian/output" ${{ inputs.registry }}/${{ inputs.arch }}/lintian:${{ inputs.release }}
shell: bash
18 changes: 17 additions & 1 deletion .github/actions/piuparts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,22 @@ inputs:
runs:
using: "composite"
steps:
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ env.GITHUB_TOKEN }}
- run: |
docker run --pull always --privileged --rm -v /var/run/docker.sock:/var/run/docker.sock -v ${{ env.CI_PROJECT_DIR }}:/__w --workdir /__w -e WORKING_DIR="/__w/debian/output" ${{ inputs.registry }}/${{ inputs.arch }}/piuparts:${{ inputs.debian_release_name }} /run.sh
docker run \
--pull always \
--privileged \
--rm \
-v /var/run/docker.sock:/var/run/docker.sock \
-v ${{ env.CI_PROJECT_DIR }}:/__w \
--workdir /__w \
-e WORKING_DIR="/__w/debian/output" \
-e GITHUB_TOKEN="${{ env.GITHUB_TOKEN }}" \
-e GITHUB_ACTOR="${{ github.actor }}" \
${{ inputs.registry }}/${{ inputs.arch }}/piuparts:${{ inputs.debian_release_name }} /run.sh
shell: bash
6 changes: 6 additions & 0 deletions .github/actions/publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ inputs:
runs:
using: "composite"
steps:
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ env.GITHUB_TOKEN }}
- run: |
docker run --rm -v ${{ env.CI_PROJECT_DIR }}:/__w -e GOS_REPOSITORY_HOST="${{ inputs.host }}" -e GOS_REPOSITORY_KEY="${{ inputs.key }}" -e WORKING_DIR="/__w" --workdir /__w ${{ inputs.registry }}/${{ inputs.arch }}/repository:bookworm /action.sh --publish
shell: bash
6 changes: 6 additions & 0 deletions .github/actions/upload/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ inputs:
runs:
using: "composite"
steps:
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ env.GITHUB_TOKEN }}
- run: |
docker run --pull always --rm -v ${{ env.CI_PROJECT_DIR }}:${{ env.CI_PROJECT_DIR }} -e GOS_REPOSITORY_HOST="${{ inputs.host }}" -e GOS_REPOSITORY_KEY="${{ inputs.key }}" -e WORKING_DIR="${{ env.WORKING_DIR }}" --workdir ${{ env.CI_PROJECT_DIR }} ${{ inputs.registry }}/${{ inputs.arch }}/repository:bookworm /action.sh --upload
shell: bash
16 changes: 16 additions & 0 deletions .github/workflows/gos-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ jobs:
arch: ${{ matrix.arch }}${{ matrix.subversion }}
registry: ${{ secrets.GOS_CI_REGISTRY }}
debian_release_name: ${{ needs.gather.outputs.debian_release_name }}
env:
GITHUB_TOKEN: ${{ github.token }}
- name: Upload changes
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -126,6 +128,8 @@ jobs:
registry: ${{ secrets.GOS_CI_REGISTRY }}
key: ${{ secrets.GOS_REPOSITORY_KEY }}
host: ${{ secrets.GOS_REPOSITORY_HOST }}
env:
GITHUB_TOKEN: ${{ github.token }}
- run: rm -r ${{ env.WORKING_DIR }}/*

test-lintian:
Expand Down Expand Up @@ -154,6 +158,8 @@ jobs:
arch: ${{ matrix.arch }}${{ matrix.subversion }}
registry: ${{ secrets.GOS_CI_REGISTRY }}
release: ${{ needs.gather.outputs.release }}
env:
GITHUB_TOKEN: ${{ github.token }}

test-autopkgtest:
name: Test with autopkgtest
Expand Down Expand Up @@ -183,6 +189,8 @@ jobs:
arch: ${{ matrix.arch }}${{ matrix.subversion }}
registry: ${{ secrets.GOS_CI_REGISTRY }}
debian_release_name: ${{ needs.gather.outputs.debian_release_name }}
env:
GITHUB_TOKEN: ${{ github.token }}

test-piuparts:
name: Test with piuparts
Expand Down Expand Up @@ -211,6 +219,8 @@ jobs:
arch: ${{ matrix.arch }}${{ matrix.subversion }}
registry: ${{ secrets.GOS_CI_REGISTRY }}
debian_release_name: ${{ needs.gather.outputs.debian_release_name }}
env:
GITHUB_TOKEN: ${{ github.token }}

test-blhc:
name: Test with blhc
Expand Down Expand Up @@ -238,6 +248,8 @@ jobs:
arch: ${{ matrix.arch }}${{ matrix.subversion }}
registry: ${{ secrets.GOS_CI_REGISTRY }}
debian_release_name: ${{ needs.gather.outputs.debian_release_name }}
env:
GITHUB_TOKEN: ${{ github.token }}

publish:
name: Publish new package
Expand All @@ -262,6 +274,8 @@ jobs:
registry: ${{ secrets.GOS_CI_REGISTRY }}
key: ${{ secrets.GOS_REPOSITORY_KEY }}
host: ${{ secrets.GOS_REPOSITORY_HOST }}
env:
GITHUB_TOKEN: ${{ github.token }}

cleanup-repo:
runs-on: self-hosted-generic
Expand All @@ -276,6 +290,8 @@ jobs:
registry: ${{ secrets.GOS_CI_REGISTRY }}
key: ${{ secrets.GOS_REPOSITORY_KEY }}
host: ${{ secrets.GOS_REPOSITORY_HOST }}
env:
GITHUB_TOKEN: ${{ github.token }}

cleanup-runner:
strategy:
Expand Down

0 comments on commit 085e645

Please sign in to comment.