diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml new file mode 100644 index 000000000..3d1247233 --- /dev/null +++ b/.github/workflows/checks.yaml @@ -0,0 +1,36 @@ +# Run 'make check' on paths ignored by test-core.yaml. +name: Run checks +on: + pull_request: + paths: + - 'demo/**' + - 'e2e/terraform/**' + - 'terraform/**' + - 'website/**' + push: + branches: + - 'main' + - 'release/**' + paths: + - 'demo/**' + - 'e2e/terraform/**' + - 'terraform/**' + - 'website/**' + workflow_call: + +jobs: + checks: + runs-on: ubuntu-22.04 + timeout-minutes: 10 + steps: + - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + with: + fetch-depth: 0 # needs tags for checkproto + - uses: hashicorp/setup-golang@v1 + - name: Run make check + run: | + make missing + make bootstrap + make check +permissions: + contents: read diff --git a/.github/workflows/test-core.yaml b/.github/workflows/test-core.yaml index 454e15b89..e63d3fd23 100644 --- a/.github/workflows/test-core.yaml +++ b/.github/workflows/test-core.yaml @@ -57,19 +57,8 @@ jobs: make tidy make bootstrap checks: + uses: ./.github/workflows/checks.yaml needs: [mods] - runs-on: ubuntu-22.04 - timeout-minutes: 10 - steps: - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - with: - fetch-depth: 0 # needs tags for checkproto - - uses: hashicorp/setup-golang@v1 - - name: Run make check - run: | - make missing - make bootstrap - make check compile: needs: [mods, checks] strategy: @@ -129,4 +118,3 @@ jobs: sudo -E env "PATH=$PATH" make test-nomad permissions: contents: read - diff --git a/terraform/azure/modules/hashistack/hashistack.tf b/terraform/azure/modules/hashistack/hashistack.tf index ff624fb0c..8cd4a3b3c 100644 --- a/terraform/azure/modules/hashistack/hashistack.tf +++ b/terraform/azure/modules/hashistack/hashistack.tf @@ -96,11 +96,11 @@ resource "azurerm_network_security_rule" "hashistack-sgr-8500" { } resource "azurerm_public_ip" "hashistack-server-public-ip" { - count = "${var.server_count}" - name = "hashistack-server-ip-${count.index}" - location = "${var.location}" - resource_group_name = "${azurerm_resource_group.hashistack.name}" - allocation_method = "Static" + count = "${var.server_count}" + name = "hashistack-server-ip-${count.index}" + location = "${var.location}" + resource_group_name = "${azurerm_resource_group.hashistack.name}" + allocation_method = "Static" } resource "azurerm_network_interface" "hashistack-server-ni" { @@ -173,11 +173,11 @@ data "template_file" "user_data_server" { } resource "azurerm_public_ip" "hashistack-client-public-ip" { - count = "${var.client_count}" - name = "hashistack-client-ip-${count.index}" - location = "${var.location}" - resource_group_name = "${azurerm_resource_group.hashistack.name}" - allocation_method = "Static" + count = "${var.client_count}" + name = "hashistack-client-ip-${count.index}" + location = "${var.location}" + resource_group_name = "${azurerm_resource_group.hashistack.name}" + allocation_method = "Static" } resource "azurerm_network_interface" "hashistack-client-ni" {