Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/github-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
release:
if: github.event.pull_request.merged == true && !contains(github.event.pull_request.title, 'skip-release')
uses: libops/.github/.github/workflows/bump-release.yaml@8dfaf9c854df71d9bbffde48c5676ff07c543c51
uses: libops/.github/.github/workflows/bump-release.yaml@main
permissions:
contents: write
actions: write
Expand Down
9 changes: 3 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.PHONY: vault-runtime-contract
.PHONY: managed-artifact-contract config-management-input-contract systemd-contract
.PHONY: sitectl-version-contract
.PHONY: host-runtime-security source-trust-contract
.PHONY: host-runtime-security
.PHONY: template-version-contract rollout-parity-contract artifact-install-contract
.PHONY: cloud-smoke-cleanup-contract hosted-cleanup-retry-contract gcp-upgrade-smoke-contract
.PHONY: go-fmt-check go-vet go-contracts cloud-compose-ci
Expand Down Expand Up @@ -39,9 +39,9 @@ export CLOUD_COMPOSE_CI_BIN
GO_MODULE_FILES := $(wildcard go.mod go.sum)
GO_SOURCES := $(shell find cmd internal -type f -name '*.go')

lint: terraform-fmt actionlint shell-lint host-runtime-security application-env-contract sitectl-host-runtime-contract vault-runtime-contract managed-artifact-contract config-management-input-contract systemd-contract source-trust-contract cloud-smoke-cleanup-contract hosted-cleanup-retry-contract gcp-upgrade-smoke-contract sitectl-version-contract template-version-contract rollout-parity-contract artifact-install-contract terraform-validate terraform-docs-check
lint: terraform-fmt actionlint shell-lint host-runtime-security application-env-contract sitectl-host-runtime-contract vault-runtime-contract managed-artifact-contract config-management-input-contract systemd-contract cloud-smoke-cleanup-contract hosted-cleanup-retry-contract gcp-upgrade-smoke-contract sitectl-version-contract template-version-contract rollout-parity-contract artifact-install-contract terraform-validate terraform-docs-check

lint-check: terraform-fmt-check actionlint shell-lint host-runtime-security application-env-contract sitectl-host-runtime-contract vault-runtime-contract managed-artifact-contract config-management-input-contract systemd-contract source-trust-contract cloud-smoke-cleanup-contract hosted-cleanup-retry-contract gcp-upgrade-smoke-contract sitectl-version-contract template-version-contract rollout-parity-contract artifact-install-contract terraform-validate terraform-docs-check
lint-check: terraform-fmt-check actionlint shell-lint host-runtime-security application-env-contract sitectl-host-runtime-contract vault-runtime-contract managed-artifact-contract config-management-input-contract systemd-contract cloud-smoke-cleanup-contract hosted-cleanup-retry-contract gcp-upgrade-smoke-contract sitectl-version-contract template-version-contract rollout-parity-contract artifact-install-contract terraform-validate terraform-docs-check

actionlint:
go run github.com/rhysd/actionlint/cmd/actionlint@$(ACTIONLINT_VERSION)
Expand Down Expand Up @@ -104,9 +104,6 @@ template-version-contract rollout-parity-contract: go-contracts
host-runtime-security:
bash ci/host-runtime-security.sh

source-trust-contract:
bash ci/source-trust-contract.sh

cloud-smoke-cleanup-contract: go-contracts

cloud-compose-ci: $(CLOUD_COMPOSE_CI_BIN)
Expand Down
64 changes: 0 additions & 64 deletions ci/source-trust-contract.sh

This file was deleted.

2 changes: 1 addition & 1 deletion modules/gcp/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -1149,7 +1149,7 @@ resource "google_service_account" "ppb" {

module "ppb" {
count = var.power_management_enabled ? 1 : 0
source = "https://github.com/libops/terraform-cloudrun-v2/archive/8415816cd559f365d7ddeee9ed3d3a88665cd824.zip//terraform-cloudrun-v2-8415816cd559f365d7ddeee9ed3d3a88665cd824"
source = "https://github.com/libops/terraform-cloudrun-v2/archive/refs/heads/main.zip//terraform-cloudrun-v2-main"

name = var.name
project = var.project_id
Expand Down
4 changes: 2 additions & 2 deletions rootfs/mnt/disks/data/libops-internal/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
lightsout:
profiles:
- lightsout
image: ghcr.io/libops/lightsout:main@sha256:4d38ac380c86514d72efbcce0af9ea8ffd7ff86e97abea3d0b3c946cf204eaae
image: ghcr.io/libops/lightsout:main
ports:
- "8808:8808"
networks:
Expand Down Expand Up @@ -40,7 +40,7 @@ services:
- /mnt/disks/data/docker/:/var/lib/docker:ro
- /dev/disk/:/dev/disk:ro
cap:
image: ghcr.io/libops/cap:main@sha256:c9d6a6c2ded2d0a72ceff382fd71da9cd161c17c071319b45270b07c0f54a5ed
image: ghcr.io/libops/cap:main
command: ["/app/binary"]
networks:
- internal
Expand Down