Skip to content
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

Preparing release 2.10 #18

Closed
wants to merge 27 commits into from
Closed

Preparing release 2.10 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
a805242
updating key4hep base
Nov 14, 2024
e7c2080
updating key4hep base
Nov 14, 2024
ed44475
Merge branch 'MuonColliderSoft:master' into 2.10
madbaron Nov 14, 2024
2d44b82
picking up new mucoll-spack
Nov 14, 2024
1f0ebd9
picking up new mucoll-spack
Nov 14, 2024
0450997
testing split build
Nov 20, 2024
0a33313
testing split build
Nov 20, 2024
62afd30
testing split build
Nov 20, 2024
3745eeb
back to GHCR
Nov 20, 2024
aba4e45
updating recommended spack version
Nov 20, 2024
f87db89
metadata v5
Nov 20, 2024
a1885de
publishing of spack image
Nov 20, 2024
885574d
artifact attestation
Nov 20, 2024
4310277
artifact attestation
Nov 20, 2024
5a18836
token permissions
Nov 20, 2024
88a46d2
cleanup
Nov 20, 2024
36b94b7
cleanup
Nov 20, 2024
2134877
free disk space
Nov 20, 2024
7d64f60
free disk space
Nov 20, 2024
3e37553
update spack commit
Nov 20, 2024
3f4e1e8
differentiating workflows
Nov 21, 2024
ae6f9ca
understanding workflows
Nov 21, 2024
f335ae3
understanding workflows
Nov 21, 2024
e79e2c3
understanding workflows
Nov 21, 2024
4e059dc
understanding workflows
Nov 21, 2024
513b6d1
getting rid of hardcoded hashes
Nov 21, 2024
ce47dfa
improving workflows
Nov 21, 2024
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
54 changes: 0 additions & 54 deletions .github/workflows/build-image.yml
View file
Open in desktop

This file was deleted.

157 changes: 157 additions & 0 deletions .github/workflows/full-rebuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
name: Re-build and publish everything

on:
push:
paths:
- 'AlmaLinux9/Dockerfile-spack'
tags:
- 'v*'
pull_request:
branches:
- 'master'
- 'main'
workflow_dispatch:

env:
REGISTRY: ghcr.io

permissions:
contents: read
packages: write
id-token: write
attestations: write

jobs:
build-spack:
runs-on: ubuntu-latest
strategy:
matrix:
os: [{dir: AlmaLinux9,suffix: alma9}]
env:
IMAGE_NAME: mucoll-spack
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Docker buildx
uses: docker/setup-buildx-action@v3
- name: Login to container registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Make owner name lowercase
run: |
echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
env:
OWNER: '${{ github.repository_owner }}'
- name: Extract metadata for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{env.OWNER_LC}}/mucoll-dummy
- name: Build and Push
id: docker_build
uses: docker/build-push-action@v6
with:
context: ./${{matrix.os.dir}}
file: ./${{matrix.os.dir}}/Dockerfile-spack
push: true
build-args: |
VERSION=${{ steps.meta.outputs.version }}
REPOSITORY=${{ env.REGISTRY }}/${{env.OWNER_LC}}
tags: ${{ env.REGISTRY }}/${{env.OWNER_LC}}/${{ env.IMAGE_NAME}}:${{steps.meta.outputs.version}}-${{matrix.os.suffix}}
labels: ${{ steps.meta.outputs.labels }}
build-base:
runs-on: ubuntu-latest
needs: build-spack
strategy:
matrix:
os: [{dir: AlmaLinux9,suffix: alma9}]
env:
IMAGE_NAME: mucoll-minimal
steps:
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
tool-cache: true
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: lowercase owner name
run: |
echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
env:
OWNER: '${{ github.repository_owner }}'
- name: Docker Meta
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{env.OWNER_LC}}/mucoll-dummy
- name: Build and Push
id: docker_build
uses: docker/build-push-action@v6
with:
push: true
context: ./${{matrix.os.dir}}
file: ./${{matrix.os.dir}}/Dockerfile-base
build-args: |
VERSION=${{ steps.meta.outputs.version }}
REPOSITORY=${{ env.REGISTRY }}/${{env.OWNER_LC}}
tags: ${{ env.REGISTRY }}/${{env.OWNER_LC}}/${{ env.IMAGE_NAME}}:${{steps.meta.outputs.version}}-${{matrix.os.suffix}}
labels: ${{ steps.meta.outputs.labels }}
build-sim:
runs-on: ubuntu-latest
needs: build-base
strategy:
matrix:
os: [{dir: AlmaLinux9,suffix: alma9}]
steps:
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
tool-cache: true
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: lowercase owner name
run: |
echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
env:
OWNER: '${{ github.repository_owner }}'
- name: Docker Meta
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{env.OWNER_LC}}/mucoll-dummy
- name: Build and Push
id: docker_build
uses: docker/build-push-action@v6
with:
push: true
context: ./${{matrix.os.dir}}
file: ./${{matrix.os.dir}}/Dockerfile-sim
build-args: |
VERSION=${{ steps.meta.outputs.version }}
REPOSITORY=${{ env.REGISTRY }}/${{env.OWNER_LC}}
tags: ${{ env.REGISTRY }}/${{env.OWNER_LC}}/mucoll-sim:${{steps.meta.outputs.version}}-${{matrix.os.suffix}}
108 changes: 108 additions & 0 deletions .github/workflows/minimal-rebuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
name: Re-build and publish Minimal

on:
push:
paths:
- 'AlmaLinux9/Dockerfile-base'
workflow_dispatch:

env:
REGISTRY: ghcr.io

permissions:
contents: read
packages: write
id-token: write
attestations: write

jobs:
build-base:
runs-on: ubuntu-latest
strategy:
matrix:
os: [{dir: AlmaLinux9,suffix: alma9}]
env:
IMAGE_NAME: mucoll-minimal
steps:
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
tool-cache: true
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: lowercase owner name
run: |
echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
env:
OWNER: '${{ github.repository_owner }}'
- name: Docker Meta
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{env.OWNER_LC}}/mucoll-dummy
- name: Build and Push
id: docker_build
uses: docker/build-push-action@v6
with:
push: true
context: ./${{matrix.os.dir}}
file: ./${{matrix.os.dir}}/Dockerfile-base
build-args: |
VERSION=${{ steps.meta.outputs.version }}
REPOSITORY=${{ env.REGISTRY }}/${{env.OWNER_LC}}
tags: ${{ env.REGISTRY }}/${{env.OWNER_LC}}/${{ env.IMAGE_NAME}}:${{steps.meta.outputs.version}}-${{matrix.os.suffix}}
labels: ${{ steps.meta.outputs.labels }}
build-sim:
runs-on: ubuntu-latest
needs: build-base
strategy:
matrix:
os: [{dir: AlmaLinux9,suffix: alma9}]
steps:
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
tool-cache: true
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: lowercase owner name
run: |
echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
env:
OWNER: '${{ github.repository_owner }}'
- name: Docker Meta
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{env.OWNER_LC}}/mucoll-dummy
- name: Build and Push
id: docker_build
uses: docker/build-push-action@v6
with:
push: true
context: ./${{matrix.os.dir}}
file: ./${{matrix.os.dir}}/Dockerfile-sim
build-args: |
VERSION=${{ steps.meta.outputs.version }}
REPOSITORY=${{ env.REGISTRY }}/${{env.OWNER_LC}}
tags: ${{ env.REGISTRY }}/${{env.OWNER_LC}}/mucoll-sim:${{steps.meta.outputs.version}}-${{matrix.os.suffix}}
61 changes: 61 additions & 0 deletions .github/workflows/mucoll-rebuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Re-build and publish MuColl

on:
push:
paths:
- 'AlmaLinux9/Dockerfile-sim'
workflow_dispatch:

env:
REGISTRY: ghcr.io

permissions:
contents: read
packages: write
id-token: write
attestations: write

jobs:
build-sim:
runs-on: ubuntu-latest
strategy:
matrix:
os: [{dir: AlmaLinux9,suffix: alma9}]
steps:
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
tool-cache: true
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: lowercase owner name
run: |
echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
env:
OWNER: '${{ github.repository_owner }}'
- name: Docker Meta
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{env.OWNER_LC}}/mucoll-dummy
- name: Build and Push
id: docker_build
uses: docker/build-push-action@v6
with:
push: true
context: ./${{matrix.os.dir}}
file: ./${{matrix.os.dir}}/Dockerfile-sim
build-args: |
VERSION=${{ steps.meta.outputs.version }}
REPOSITORY=${{ env.REGISTRY }}/${{env.OWNER_LC}}
tags: ${{ env.REGISTRY }}/${{env.OWNER_LC}}/mucoll-sim:${{steps.meta.outputs.version}}-${{matrix.os.suffix}}
Loading
Loading