cleanup
This commit is contained in:
parent
2da703d938
commit
7cce664a11
1 changed files with 13 additions and 22 deletions
|
|
@ -32,6 +32,9 @@ jobs:
|
||||||
nix-env -iA nixpkgs.ansible
|
nix-env -iA nixpkgs.ansible
|
||||||
nix-env -iA nixpkgs.jq
|
nix-env -iA nixpkgs.jq
|
||||||
nix-env -iA nixpkgs.openssh
|
nix-env -iA nixpkgs.openssh
|
||||||
|
nix-env -iA cachix -f https://cachix.org/api/v1/install
|
||||||
|
cachix use plasmagoat
|
||||||
|
cachix authtoken ${{ secrets.CACHIX_AUTH_TOKEN }}
|
||||||
|
|
||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
@ -62,14 +65,8 @@ jobs:
|
||||||
echo "Testing SSH connection to $PROXMOX_HOST..."
|
echo "Testing SSH connection to $PROXMOX_HOST..."
|
||||||
ssh -o StrictHostKeyChecking=yes "$PROXMOX_USER"@"$PROXMOX_HOST" "echo 'SSH success. Hostname:' && hostname"
|
ssh -o StrictHostKeyChecking=yes "$PROXMOX_USER"@"$PROXMOX_HOST" "echo 'SSH success. Hostname:' && hostname"
|
||||||
|
|
||||||
- name: Setup Cachix
|
- name: Build NixOS image
|
||||||
run: |
|
id: build_image
|
||||||
nix-env -iA cachix -f https://cachix.org/api/v1/install
|
|
||||||
cachix use plasmagoat
|
|
||||||
cachix authtoken ${{ secrets.CACHIX_AUTH_TOKEN }}
|
|
||||||
|
|
||||||
- name: Build NixOS image (creates result/ symlink)
|
|
||||||
id: build_image # Changed ID for clarity
|
|
||||||
run: |
|
run: |
|
||||||
nix build .#base \
|
nix build .#base \
|
||||||
--builders "ssh://$NIXOS_BUILER_USER@$NIXOS_BUILER_HOST x86_64-linux ~/.ssh/id_rsa 1 1 kvm" \
|
--builders "ssh://$NIXOS_BUILER_USER@$NIXOS_BUILER_HOST x86_64-linux ~/.ssh/id_rsa 1 1 kvm" \
|
||||||
|
|
@ -85,15 +82,6 @@ jobs:
|
||||||
fi
|
fi
|
||||||
echo "image_path_from_build=${IMAGE_PATH}" >> "$GITHUB_OUTPUT"
|
echo "image_path_from_build=${IMAGE_PATH}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Set VERSION from tag or fallback
|
|
||||||
id: version # Keep original ID
|
|
||||||
run: |
|
|
||||||
if [ -n "${CI_COMMIT_TAG}" ]; then # Use CI_COMMIT_TAG for Forgejo
|
|
||||||
echo "tag=${CI_COMMIT_TAG}" >> "$GITHUB_OUTPUT"
|
|
||||||
else
|
|
||||||
echo "tag=dev-$(date +%s)" >> "$GITHUB_OUTPUT"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Run Proxmox Image Deployment
|
- name: Run Proxmox Image Deployment
|
||||||
run: |
|
run: |
|
||||||
chmod +x ./scripts/run_ansible_ci.sh
|
chmod +x ./scripts/run_ansible_ci.sh
|
||||||
|
|
@ -122,11 +110,14 @@ jobs:
|
||||||
if: success()
|
if: success()
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
# - name: Download Artifact
|
- name: Set VERSION from tag or fallback
|
||||||
# id: artifact
|
id: version
|
||||||
# uses: actions/download-artifact@v3
|
run: |
|
||||||
# with:
|
if [ -n "${CI_COMMIT_TAG}" ]; then # Use CI_COMMIT_TAG for Forgejo
|
||||||
# name: nixos-base-image
|
echo "tag=${CI_COMMIT_TAG}" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "tag=dev-$(date +%s)" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Create Forgejo Release
|
- name: Create Forgejo Release
|
||||||
uses: https://code.forgejo.org/sheik/forgejo-release@v2.6.0
|
uses: https://code.forgejo.org/sheik/forgejo-release@v2.6.0
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue