Skip to content

Commit

Permalink
Merge pull request #66 from ZeroGachis/sleep_30sec
Browse files Browse the repository at this point in the history
Add sleep to let tailscale up the networks
  • Loading branch information
rodo authored Feb 5, 2024
2 parents ddd2ddb + 25630cb commit cabc608
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 13 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ jobs:
tags: tag:ci
version: ${{ vars.TAILSCALE_VERSION }}

- name: Sleep for 30 seconds
run: sleep 30s
shell: bash

- name: Checkout
uses: actions/checkout@v4

Expand Down
30 changes: 17 additions & 13 deletions .github/workflows/terraform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ on:
workdir:
required: false
type: string
default: ${{ github.workspace }}
default: ${{ github.workspace }}
terraform_check_only:
required: false
type: boolean
default: true
environment_name:
environment_name:
required: false
type: string
terraform_workspace:
Expand Down Expand Up @@ -42,36 +42,36 @@ on:
required: false
type: boolean
default: true
vault_url:
vault_url:
required: false
type: string
vault_github_actions_role:
required: false
required: false
type: string
vault_secrets:
required: false
required: false
type: string
aws_secrets:
required: false
required: false
type: string
aws_additional_secrets:
required: false
required: false
type: string
tailscale_enabled:
required: false
required: false
type: boolean
default: true

jobs:
terraform:
name: "Terraform"
permissions:
id-token: write
contents: read
runs-on: ubuntu-latest
environment:
environment:
name: ${{ inputs.environment_name }}
env:
env:
VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
Expand All @@ -91,6 +91,10 @@ jobs:
tags: tag:ci
version: ${{ vars.TAILSCALE_VERSION }}

- name: Sleep for 30 seconds
run: sleep 30s
shell: bash

- name: Import Secrets
if: inputs.vault_enabled
id: secrets
Expand All @@ -107,7 +111,7 @@ jobs:
- uses: hashicorp/setup-terraform@v3
with:
cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}

- name: Checkout
uses: actions/checkout@v4

Expand Down Expand Up @@ -143,7 +147,7 @@ jobs:
id: workspace
working-directory: ${{ inputs.workdir || github.workspace }}
run: terraform workspace select ${{ inputs.terraform_workspace }} || terraform workspace new ${{ inputs.terraform_workspace }}

- name: Terraform Plan
id: plan
working-directory: ${{ inputs.workdir || github.workspace }}
Expand Down

0 comments on commit cabc608

Please sign in to comment.