Skip to content

Commit

Permalink
Merge branch 'main' into registry
Browse files Browse the repository at this point in the history
  • Loading branch information
eveld committed Apr 15, 2024
2 parents 066cfbd + afc92d0 commit cdaf33e
Show file tree
Hide file tree
Showing 59 changed files with 2,153 additions and 754 deletions.
2 changes: 0 additions & 2 deletions .dagger/.gitattributes

This file was deleted.

32 changes: 0 additions & 32 deletions .dagger/dagger.json

This file was deleted.

25 changes: 0 additions & 25 deletions .dagger/go.mod

This file was deleted.

60 changes: 0 additions & 60 deletions .dagger/go.sum

This file was deleted.

115 changes: 53 additions & 62 deletions .github/workflows/build_and_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ jobs:
uses: dagger/dagger-for-github@v5
with:
verb: call
module: ./.dagger
module: ./dagger
args: all --output=./output --src=. --github-token=GITHUB_TOKEN --notorize-cert=./cert.p12 --notorize-cert-password=QUILL_SIGN_PASSWORD --notorize-key=./key.p8 --notorize-id=${{secrets.QUILL_NOTARY_KEY_ID}} --notorize-issuer=${{secrets.QUILL_NOTARY_ISSUER}}
version: "0.9.9"
cloud-token: ${{ secrets.DAGGER_TOKEN }}
version: "0.11.0"

- name: Upload artifacts
uses: actions/upload-artifact@v2
Expand All @@ -51,20 +50,20 @@ jobs:
needs: dagger_build

strategy:
max-parallel: 2
max-parallel: 5
fail-fast: false
matrix:
folder: [
'./examples/container',
'./examples/build',
'./examples/docs',
'./examples/nomad',
'./examples/single_k3s_cluster',
'./examples/multiple_k3s_clusters',
'./examples/exec',
'./examples/certificates',
'./examples/terraform',
'./examples/registries',
'/container',
'/build',
'/docs',
'/nomad',
'/single_k3s_cluster',
'/multiple_k3s_clusters',
'/exec',
'/certificates',
'/terraform',
'/registries',
]

steps:
Expand All @@ -83,11 +82,13 @@ jobs:
- uses: actions/checkout@v2

- name: Run tests
run: |
jumppad check --non-interactive
jumppad purge --non-interactive
jumppad test --non-interactive ${{matrix.folder}}
- name: All
uses: dagger/dagger-for-github@v5
with:
verb: call
module: ./dagger
args: functional-test --src=./examples --working-directory=${{matrix.folder}} --jumppad=/usr/local/bin/jumppad --runtime=docker
version: "0.11.0"

- name: Send status to Discord
uses: sarisia/actions-status-discord@v1
Expand All @@ -103,17 +104,19 @@ jobs:
needs: dagger_build

strategy:
max-parallel: 2
max-parallel: 5
fail-fast: false
matrix:
folder: [
'./examples/container',
'./examples/build',
'./examples/docs',
'./examples/nomad',
'./examples/single_k3s_cluster',
'./examples/multiple_k3s_clusters',
'./examples/exec',
'/container',
'/build',
'/docs',
'/nomad',
'/single_k3s_cluster',
'/multiple_k3s_clusters',
'/exec',
'/certificates',
'/terraform',
]

steps:
Expand All @@ -132,38 +135,14 @@ jobs:
- uses: actions/checkout@v2

- name: Install dependencies for Podman tests
run: |
sudo mkdir -p /etc/apt/keyrings
# Debian Unstable/Sid
curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/Debian_Unstable/Release.key \
| gpg --dearmor \
| sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null
echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg]\
https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/Debian_Unstable/ /" \
| sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null
# Install Podman
sudo apt-get update
sudo apt-get -y upgrade
sudo apt-get -y install podman
# Start the Podman sock
sudo nohup podman system service -t 0 > ./podman.log &
sleep 10
sudo chmod +x /run/podman
sudo chmod 777 /run/podman/podman.sock
- name: All
uses: dagger/dagger-for-github@v5
with:
verb: call
module: ./dagger
args: functional-test --src=./examples --working-directory=${{matrix.folder}} --jumppad=/usr/local/bin/jumppad --runtime=podman
version: "0.11.0"

- name: Run tests
run: |
jumppad check --non-interactive
jumppad purge --non-interactive
jumppad test --non-interactive ${{matrix.folder}}
env:
DOCKER_HOST: "unix:///run/podman/podman.sock"

- name: Send status to Discord
uses: sarisia/actions-status-discord@v1
if: always()
Expand Down Expand Up @@ -200,10 +179,9 @@ jobs:
uses: dagger/dagger-for-github@v5
with:
verb: call
module: ./.dagger
module: ./dagger
args: release --src=. --github-token=GITHUB_TOKEN --gemfury-token=GEMFURY_TOKEN --archives=./build_artifacts --output=./version.txt
version: "0.9.9"
cloud-token: ${{ secrets.DAGGER_TOKEN }}
version: "0.11.0"

- name: Set output
id: setoutput
Expand All @@ -212,11 +190,24 @@ jobs:
outputs:
version: ${{ steps.setoutput.outputs.version }}


sync_winget:
name: Sync winget-pkgs repo
if: ${{ github.ref == 'refs/heads/main' }}
needs:
- functional_test_docker
- functional_test_podman
runs-on: ubuntu-latest
steps:
- run: gh repo sync nicholasjackson/winget-pkgs -b master
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}

winget:
name: Publish to WinGet
needs:
- release
- sync_winget
runs-on: windows-latest
steps:
- uses: jumppad-labs/[email protected]
Expand Down
17 changes: 0 additions & 17 deletions .gon_amd64.json

This file was deleted.

17 changes: 0 additions & 17 deletions .gon_arm64.json

This file was deleted.

Loading

0 comments on commit cdaf33e

Please sign in to comment.