chore(ci): consistent file types (#2341)

use yamls

issue: none

.github/workflows/ci-main.yml → .github/workflows/ci-main.yaml

@@ -13,24 +13,24 @@ permissions:
 
 jobs:
   pre-commit:
-    uses: ./.github/workflows/pre-commit.yml
+    uses: ./.github/workflows/pre-commit.yaml
   go-tests:
-    uses: ./.github/workflows/gotest.yml
+    uses: ./.github/workflows/gotest.yaml
   go-lint:
-    uses: ./.github/workflows/golangci-lint.yml
+    uses: ./.github/workflows/golangci-lint.yaml
   sol-tests:
-      uses: ./.github/workflows/soltest.yml
+      uses: ./.github/workflows/soltest.yaml
   cli-install:
-    uses: ./.github/workflows/cliinstall.yml
+    uses: ./.github/workflows/cliinstall.yaml
   cli-command:
-    uses: ./.github/workflows/clicommand.yml
+    uses: ./.github/workflows/clicommand.yaml
   release-snapshot:
-    uses: ./.github/workflows/release-snapshot.yml
+    uses: ./.github/workflows/release-snapshot.yaml
     needs: [pre-commit, go-tests, go-lint, sol-tests]
     secrets: inherit
   e2e:
-    uses: ./.github/workflows/e2etest.yml
+    uses: ./.github/workflows/e2etest.yaml
     needs: [release-snapshot]
   e2e-test-admin:
-    uses: ./.github/workflows/e2etestadmin.yml
+    uses: ./.github/workflows/e2etestadmin.yaml
     needs: [release-snapshot]

.github/workflows/ci-pr.yaml

@@ -0,0 +1,33 @@
+name: ci pr
+# continuous integration on pull requests to main and release branches
+
+on:
+  pull_request:
+    branches:
+      - main
+      - release/**
+      - upgrade/** # Run CI against upgrade PRs
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  pre-commit:
+    uses: ./.github/workflows/pre-commit.yaml
+  go-tests:
+    uses: ./.github/workflows/gotest.yaml
+  go-lint:
+    uses: ./.github/workflows/golangci-lint.yaml
+  cli-install:
+    uses: ./.github/workflows/cliinstall.yaml
+  cli-command:
+    uses: ./.github/workflows/clicommand.yaml
+  sol-tests:
+    uses: ./.github/workflows/soltest.yaml
+  e2e-tests:
+    uses: ./.github/workflows/pr-e2etest.yaml
+  check-sol-artifacts:
+    uses: ./.github/workflows/check-sol-artifacts.yaml
+  pr-label:
+    uses: ./.github/workflows/pr-label.yaml

.github/workflows/ci-release.yml → .github/workflows/ci-release.yaml

@@ -11,5 +11,5 @@ permissions:
 
 jobs:
   release-official:
-    uses: ./.github/workflows/release-official.yml
+    uses: ./.github/workflows/release-official.yaml
     secrets: inherit

.pre-commit-config.yaml

@@ -32,7 +32,7 @@ repos:
 
   # Then run code validators (on the formatted code)
 
-  - repo: https://github.com/golangci/golangci-lint # See .golangci.yml for config
+  - repo: https://github.com/golangci/golangci-lint # See .golangci.yaml for config
     rev: v1.60.3
     hooks:
       - id: golangci-lint

cli/cmd/initnodes.go

@@ -50,7 +50,7 @@ func (c InitConfig) Verify() error {
 	return c.Network.Verify()
 }
 
-//go:embed compose.yml.tpl
+//go:embed compose.yaml.tpl
 var composeTpl []byte
 
 func newInitCmd() *cobra.Command {
@@ -184,7 +184,7 @@ func maybeDownloadGenesis(ctx context.Context, network netconf.ID) error {
 }
 
 func writeComposeFile(ctx context.Context, cfg InitConfig) error {
-	composeFile := filepath.Join(cfg.Home, "compose.yml")
+	composeFile := filepath.Join(cfg.Home, "compose.yaml")
 
 	if cmtos.FileExists(composeFile) {
 		log.Info(ctx, "Found existing compose file", "path", composeFile)
@@ -229,7 +229,7 @@ func writeComposeFile(ctx context.Context, cfg InitConfig) error {
 		return errors.Wrap(err, "writing compose file")
 	}
 
-	log.Info(ctx, "Generated docker compose file", "path", filepath.Join(cfg.Home, "compose.yml"), "geth_version", geth.Version, "halo_version", cfg.HaloTag)
+	log.Info(ctx, "Generated docker compose file", "path", filepath.Join(cfg.Home, "compose.yaml"), "geth_version", geth.Version, "halo_version", cfg.HaloTag)
 
 	return nil
 }

docs/content/operate/config.md

@@ -9,7 +9,7 @@ The resulting `~/.omni/<network>` folder has the following structure:
 ~/.omni/<network>/     # Node home folder
  ├─ halo/              # Consensus client
  ├─ geth/              # Execution client
- ├─ compose.yml        # Docker compose
+ ├─ compose.yaml        # Docker compose
 ```
 
 It is a valid configuration for running a production Omni full node.
@@ -175,9 +175,9 @@ A path to this file (or copy of) must be provided in the `halo.toml` `engine-jwt
 
 ## Configure Docker Compose
 The preferred way to run an Omni node is via Docker Compose as described in the [Run a Full Node](run-full-node.md#halo-deployment-options) docs.
-The docker `compose.yml` file is located in `~/.omni/<network>/compose.yml`.
+The docker `compose.yaml` file is located in `~/.omni/<network>/compose.yaml`.
 
-Download the latest template `compose.yml` [here](https://github.com/omni-network/omni/blob/main/cli/cmd/compose.yml.tpl).
+Download the latest template `compose.yaml` [here](https://github.com/omni-network/omni/blob/main/cli/cmd/compose.yaml.tpl).
 
 Ensure the following template fields are replaced:
 - `{{.HaloTag}}`: The latest `omniops/halovisor` docker image tag, e.g. `v0.99.0`, see [releases](https://github.com/omni-network/omni/releases)

e2e/app/agent/prometheus.go

@@ -29,7 +29,7 @@ const (
 	gethPromPort = 6060
 )
 
-//go:embed prometheus.yml.tmpl
+//go:embed prometheus.yaml.tmpl
 var promConfigTmpl []byte
 
 func WriteConfig(ctx context.Context, testnet types.Testnet, secrets Secrets) error {
@@ -43,7 +43,7 @@ func WriteConfig(ctx context.Context, testnet types.Testnet, secrets Secrets) er
 		return errors.Wrap(err, "generating prometheus config")
 	}
 
-	promFile := filepath.Join(testnet.Dir, "prometheus", "prometheus.yml")
+	promFile := filepath.Join(testnet.Dir, "prometheus", "prometheus.yaml")
 	if err := os.MkdirAll(filepath.Dir(promFile), 0755); err != nil {
 		return errors.Wrap(err, "creating prometheus dir")
 	}

e2e/docker/compose.yaml.tmpl

@@ -134,14 +134,14 @@ services:
     container_name: prometheus
     image: prom/prometheus:latest
     command:
-      - --config.file=/etc/prometheus/prometheus.yml
+      - --config.file=/etc/prometheus/prometheus.yaml
       - --web.console.libraries=/usr/share/prometheus/console_libraries
       - --web.console.templates=/usr/share/prometheus/consoles
       - --enable-feature=exemplar-storage
       - --enable-feature=agent
     restart: unless-stopped
     volumes:
-      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+      - ./prometheus/prometheus.yaml:/etc/prometheus/prometheus.yaml
     networks:
       {{ $.NetworkName }}:
         {{ if $.Network }}ipv4_address: 10.186.73.202{{ end }}

e2e/docker/docker.go

@@ -98,7 +98,7 @@ func (p *Provider) Setup() error {
 		return errors.Wrap(err, "generate compose file")
 	}
 
-	err = os.WriteFile(filepath.Join(p.Testnet.Dir, "docker-compose.yml"), bz, 0o644)
+	err = os.WriteFile(filepath.Join(p.Testnet.Dir, "docker-compose.yaml"), bz, 0o644)
 	if err != nil {
 		return errors.Wrap(err, "write compose file")
 	}
@@ -316,7 +316,7 @@ func additionalServices(testnet types.Testnet) []string {
 // ExecCompose runs a Docker Compose command for a testnet.
 func ExecCompose(ctx context.Context, dir string, args ...string) error {
 	err := exec.Command(ctx, append(
-		[]string{"docker", "compose", "-f", filepath.Join(dir, "docker-compose.yml")},
+		[]string{"docker", "compose", "-f", filepath.Join(dir, "docker-compose.yaml")},
 		args...)...)
 	if err != nil {
 		return errors.Wrap(err, "exec docker-compose")
@@ -328,7 +328,7 @@ func ExecCompose(ctx context.Context, dir string, args ...string) error {
 // ExecComposeVerbose runs a Docker Compose command for a testnet and displays its output.
 func ExecComposeVerbose(ctx context.Context, dir string, args ...string) error {
 	err := exec.CommandVerbose(ctx, append(
-		[]string{"docker", "compose", "-f", filepath.Join(dir, "docker-compose.yml")},
+		[]string{"docker", "compose", "-f", filepath.Join(dir, "docker-compose.yaml")},
 		args...)...)
 	if err != nil {
 		return errors.Wrap(err, "exec docker-compose verbose")
@@ -358,7 +358,7 @@ func Exec(ctx context.Context, args ...string) error {
 //		   image: omniops/halo:main # Upgrade node0:omniops/halo:v1.0
 //		   restart: unless-stopped
 func ReplaceUpgradeImage(dir, service string) error {
-	before, err := os.ReadFile(filepath.Join(dir, "docker-compose.yml"))
+	before, err := os.ReadFile(filepath.Join(dir, "docker-compose.yaml"))
 	if err != nil {
 		return errors.Wrap(err, "read compose file")
 	}
@@ -370,7 +370,7 @@ func ReplaceUpgradeImage(dir, service string) error {
 		return errors.New("no upgrade image found")
 	}
 
-	err = os.WriteFile(filepath.Join(dir, "docker-compose.yml"), after, 0o644)
+	err = os.WriteFile(filepath.Join(dir, "docker-compose.yaml"), after, 0o644)
 	if err != nil {
 		return errors.Wrap(err, "write compose file")
 	}

e2e/docker/docker_test.go

@@ -123,7 +123,7 @@ func TestComposeTemplate(t *testing.T) {
 
 			require.NoError(t, p.Setup())
 
-			bz, err := os.ReadFile(filepath.Join(dir, "docker-compose.yml"))
+			bz, err := os.ReadFile(filepath.Join(dir, "docker-compose.yaml"))
 			require.NoError(t, err)
 
 			tutil.RequireGoldenBytes(t, bz)
@@ -137,7 +137,7 @@ func TestComposeTemplate(t *testing.T) {
 				}
 				require.NoError(t, err)
 
-				bz, err := os.ReadFile(filepath.Join(dir, "docker-compose.yml"))
+				bz, err := os.ReadFile(filepath.Join(dir, "docker-compose.yaml"))
 				require.NoError(t, err)
 
 				tutil.RequireGoldenBytes(t, bz)

e2e/docker/testdata/TestComposeTemplate_commit.golden

@@ -135,14 +135,14 @@ services:
     container_name: prometheus
     image: prom/prometheus:latest
     command:
-      - --config.file=/etc/prometheus/prometheus.yml
+      - --config.file=/etc/prometheus/prometheus.yaml
       - --web.console.libraries=/usr/share/prometheus/console_libraries
       - --web.console.templates=/usr/share/prometheus/consoles
       - --enable-feature=exemplar-storage
       - --enable-feature=agent
     restart: unless-stopped
     volumes:
-      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+      - ./prometheus/prometheus.yaml:/etc/prometheus/prometheus.yaml
     networks:
       test:
         ipv4_address: 10.186.73.202

e2e/docker/testdata/TestComposeTemplate_empheral_network.golden

@@ -135,14 +135,14 @@ services:
     container_name: prometheus
     image: prom/prometheus:latest
     command:
-      - --config.file=/etc/prometheus/prometheus.yml
+      - --config.file=/etc/prometheus/prometheus.yaml
       - --web.console.libraries=/usr/share/prometheus/console_libraries
       - --web.console.templates=/usr/share/prometheus/consoles
       - --enable-feature=exemplar-storage
       - --enable-feature=agent
     restart: unless-stopped
     volumes:
-      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+      - ./prometheus/prometheus.yaml:/etc/prometheus/prometheus.yaml
     networks:
       test:
         ipv4_address: 10.186.73.202

e2e/docker/testdata/TestComposeTemplate_empheral_network_upgrade.golden

@@ -135,14 +135,14 @@ services:
     container_name: prometheus
     image: prom/prometheus:latest
     command:
-      - --config.file=/etc/prometheus/prometheus.yml
+      - --config.file=/etc/prometheus/prometheus.yaml
       - --web.console.libraries=/usr/share/prometheus/console_libraries
       - --web.console.templates=/usr/share/prometheus/consoles
       - --enable-feature=exemplar-storage
       - --enable-feature=agent
     restart: unless-stopped
     volumes:
-      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+      - ./prometheus/prometheus.yaml:/etc/prometheus/prometheus.yaml
     networks:
       test:
         ipv4_address: 10.186.73.202

e2e/vmcompose/provider.go

@@ -125,8 +125,8 @@ func (p *Provider) Setup() error {
 			continue // No need to generate prometheus config
 		}
 
-		// Update custom prometheus.yml config for this VM
-		promCfgFile := filepath.Join(p.Testnet.Dir, "prometheus", "prometheus.yml")
+		// Update custom prometheus.yaml config for this VM
+		promCfgFile := filepath.Join(p.Testnet.Dir, "prometheus", "prometheus.yaml")
 		agentCfg, err := os.ReadFile(promCfgFile)
 		if err != nil {
 			return errors.Wrap(err, "read prometheus config")
@@ -195,7 +195,7 @@ func (p *Provider) Upgrade(ctx context.Context, cfg types.ServiceConfig) error {
 	addFile("monitor", "monitor.toml")
 	addFile("monitor", "privatekey")
 
-	addFile("prometheus", "prometheus.yml") // Prometheus isn't a "service", so not actually copied
+	addFile("prometheus", "prometheus.yaml") // Prometheus isn't a "service", so not actually copied
 
 	// Do initial sequential ssh to each VM, ensure we can connect.
 	for vmName, instance := range p.Data.VMs {
@@ -242,7 +242,7 @@ func (p *Provider) Upgrade(ctx context.Context, cfg types.ServiceConfig) error {
 				}
 			}
 
-			log.Debug(ctx, "Copying docker-compose.yml", "vm", vmName)
+			log.Debug(ctx, "Copying docker-compose.yaml", "vm", vmName)
 			composeFile := vmComposeFile(instance.IPAddress.String())
 			localComposePath := filepath.Join(p.Testnet.Dir, composeFile)
 			remoteComposePath := filepath.Join("/omni", p.Testnet.Name, composeFile)
@@ -342,7 +342,7 @@ func (p *Provider) StartNodes(ctx context.Context, _ ...*e2e.Node) error {
 			startCmd := fmt.Sprintf("cd /omni/%s && "+
 				"sudo mv %s docker-compose.yaml && "+
 				"sudo mv %s evm-init.sh && "+
-				"sudo mv %s prometheus/prometheus.yml && "+
+				"sudo mv %s prometheus/prometheus.yaml && "+
 				"sudo docker compose pull &&"+
 				"sudo ./evm-init.sh && "+
 				"sudo docker compose up -d &&"+
@@ -463,7 +463,7 @@ func copyFileToGCP(ctx context.Context, localPath string, remotePath string, ide
 }
 
 func vmAgentFile(internalIP string) string {
-	return "prometheus/" + strings.ReplaceAll(internalIP, ".", "-") + "-prometheus.yml"
+	return "prometheus/" + strings.ReplaceAll(internalIP, ".", "-") + "-prometheus.yaml"
 }
 
 func vmComposeFile(internalIP string) string {

scripts/install_foundry.sh

@@ -11,7 +11,7 @@ fi
 
 # This tells https://foundry.paradigm.xyz where to install foundryup -
 # $FOUNDRY_DIR/bin. This dir is added to $GITHUB_PATH in
-# .github/workflows/pre-commit.yml
+# .github/workflows/pre-commit.yaml
 export FOUNDRY_DIR="$HOME/.foundry";
 
 

scripts/verifypr/README.md

@@ -1,6 +1,6 @@
 # verifypr
 
-Simple script that is called by [verifypr](../../.github/workflows/ci-verifypr.yml) github action
+Simple script that is called by [verifypr](../../.github/workflows/ci-verifypr.yaml) github action
 that verifies omni PRs against the conventional commit template.
 
 See supported types [here](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional#type-enum)