Skip to content

Commit bfc5ca0

Browse files
milldrmilldr
committed
reset examples
1 parent 3efee6c commit bfc5ca0

File tree

4 files changed

+1
-207
lines changed

4 files changed

+1
-207
lines changed

‎examples/snippets/.github/workflows/atmos-pro-terraform-apply.yaml‎

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,3 @@
1-
<<<<<<< HEAD
2-
<<<<<<< HEAD
3-
name: Atmos Pro Terraform Apply
4-
=======
5-
name: 👽 Atmos Pro Terraform Apply
6-
run-name: apply ${{ inputs.component }}/${{ inputs.stack }}/${{ inputs.atmos_pro_run_id}}
7-
>>>>>>> 525f355ffc4471dbb3988fdb48edc3d1b84efc13
8-
9-
on:
10-
workflow_dispatch:
11-
inputs:
12-
atmos_pro_run_id:
13-
description: "Atmos Pro Run ID"
14-
type: string
15-
sha:
16-
description: "Commit SHA"
17-
type: string
18-
component:
19-
description: "Component"
20-
required: true
21-
type: string
22-
stack:
23-
description: "Stack"
24-
required: true
25-
type: string
26-
github_environment:
27-
description: "GitHub Environment"
28-
required: true
29-
type: string
30-
31-
# Avoid running the same stack in parallel mode (from different workflows)
32-
# This applied to across workflows to both plan and apply
33-
concurrency:
34-
group: "${{ inputs.stack }}-${{ inputs.component }}"
35-
cancel-in-progress: false
36-
37-
permissions:
38-
id-token: write # This is required for requesting the JWT
39-
contents: read # This is required for actions/checkout
40-
41-
jobs:
42-
atmos-apply:
43-
name: ${{ inputs.component }}-${{ inputs.stack }}
44-
45-
# The GitHub environment is defined in Atmos Pro settings.
46-
# Typically this is <tenant>-<stage>
47-
environment: ${{ inputs.github_environment }}
48-
49-
runs-on:
50-
- "runs-on=${{ github.run_id }}"
51-
- "runner=terraform"
52-
- "tag=${{ inputs.component }}-${{ inputs.stack }}"
53-
- "private=false"
54-
55-
steps:
56-
- uses: runs-on/action@v1
57-
- uses: unfor19/install-aws-cli-action@v1
58-
59-
- name: Apply Atmos Component
60-
uses: cloudposse/github-action-atmos-terraform-apply@v4
61-
with:
62-
# Atmos Pro args
63-
component: ${{ inputs.component }}
64-
stack: ${{ inputs.stack }}
65-
<<<<<<< HEAD
66-
component: ${{ inputs.component }}
67-
=======
681
name: 👽 Atmos Pro Terraform Apply
692
run-name: apply ${{ inputs.component }}/${{ inputs.stack }}/${{ inputs.atmos_pro_run_id}}
703

@@ -124,14 +57,7 @@ jobs:
12457
# Atmos Pro args
12558
component: ${{ inputs.component }}
12659
stack: ${{ inputs.stack }}
127-
=======
128-
>>>>>>> 525f355ffc4471dbb3988fdb48edc3d1b84efc13
12960
sha: ${{ inputs.sha }}
13061
# Atmos required configuration
13162
atmos-version: ${{ vars.ATMOS_VERSION }}
13263
atmos-config-path: ${{ vars.ATMOS_CONFIG_PATH }}
133-
<<<<<<< HEAD
134-
>>>>>>> master
135-
=======
136-
137-
>>>>>>> 525f355ffc4471dbb3988fdb48edc3d1b84efc13

‎examples/snippets/.github/workflows/atmos-pro-terraform-plan.yaml‎

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
<<<<<<< HEAD
2-
<<<<<<< HEAD
3-
name: Atmos Pro Terraform Plan
4-
=======
51
name: 👽 Atmos Pro Terraform Plan
62
run-name: plan ${{ inputs.component }}/${{ inputs.stack }}/${{ inputs.atmos_pro_run_id}}
7-
>>>>>>> 525f355ffc4471dbb3988fdb48edc3d1b84efc13
83

94
on:
105
workflow_dispatch:
@@ -54,68 +49,7 @@ jobs:
5449
# Atmos Pro args
5550
component: ${{ inputs.component }}
5651
stack: ${{ inputs.stack }}
57-
<<<<<<< HEAD
58-
component: ${{ inputs.component }}
59-
=======
60-
name: 👽 Atmos Pro Terraform Plan
61-
run-name: plan ${{ inputs.component }}/${{ inputs.stack }}/${{ inputs.atmos_pro_run_id}}
62-
63-
on:
64-
workflow_dispatch:
65-
inputs:
66-
atmos_pro_run_id:
67-
description: "Atmos Pro Run ID"
68-
type: string
69-
sha:
70-
description: "Commit SHA"
71-
type: string
72-
component:
73-
description: "Component"
74-
required: true
75-
type: string
76-
stack:
77-
description: "Stack"
78-
required: true
79-
type: string
80-
81-
# Avoid running the same stack in parallel mode (from different workflows)
82-
# This applied to across workflows to both plan and apply
83-
concurrency:
84-
group: "${{ inputs.stack }}-${{ inputs.component }}"
85-
cancel-in-progress: false
86-
87-
permissions:
88-
id-token: write # This is required for requesting the JWT (OIDC) token
89-
contents: read # This is required for actions/checkout
90-
91-
jobs:
92-
atmos-plan:
93-
name: ${{ inputs.component }}-${{ inputs.stack }}
94-
95-
runs-on:
96-
- "runs-on=${{ github.run_id }}"
97-
- "runner=terraform"
98-
- "tag=${{ inputs.component }}-${{ inputs.stack }}"
99-
- "private=false"
100-
101-
steps:
102-
- uses: runs-on/action@v1
103-
- uses: unfor19/install-aws-cli-action@v1
104-
105-
- name: Plan Atmos Component
106-
uses: cloudposse/github-action-atmos-terraform-plan@v5
107-
with:
108-
# Atmos Pro args
109-
component: ${{ inputs.component }}
110-
stack: ${{ inputs.stack }}
111-
=======
112-
>>>>>>> 525f355ffc4471dbb3988fdb48edc3d1b84efc13
11352
sha: ${{ inputs.sha }}
11453
# Atmos required configuration
11554
atmos-version: ${{ vars.ATMOS_VERSION }}
11655
atmos-config-path: ${{ vars.ATMOS_CONFIG_PATH }}
117-
<<<<<<< HEAD
118-
>>>>>>> master
119-
=======
120-
121-
>>>>>>> 525f355ffc4471dbb3988fdb48edc3d1b84efc13

‎examples/snippets/.github/workflows/atmos-pro.yaml‎

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
<<<<<<< HEAD
2-
<<<<<<< HEAD
3-
name: Atmos Pro
4-
=======
51
name: 👽 Atmos Pro Determine Affected Stacks
62
run-name: 👽 Atmos Pro Determine Affected Stacks
7-
>>>>>>> 525f355ffc4471dbb3988fdb48edc3d1b84efc13
83

94
# Atmos Pro reacts to events defined in the Atmos stack settings
105
# and will trigger the appropriate workflows for the given event.
@@ -52,61 +47,6 @@ jobs:
5247
if: github.event.action == 'closed'
5348
uses: actions/checkout@v4
5449
with:
55-
<<<<<<< HEAD
56-
workspace-id: ${{ vars.ATMOS_PRO_WORKSPACE_ID }}
57-
api-key: ${{ secrets.ATMOS_PRO_API_KEY }}
58-
=======
59-
name: 👽 Atmos Pro Determine Affected Stacks
60-
run-name: 👽 Atmos Pro Determine Affected Stacks
61-
62-
# Atmos Pro reacts to events defined in the Atmos stack settings
63-
# and will trigger the appropriate workflows for the given event.
64-
#
65-
# For example, pull requests opened, synchronize, and reopened will trigger plan workflows.
66-
# Whereas pull requests merged will trigger apply workflows
67-
on:
68-
pull_request:
69-
types:
70-
- opened
71-
- synchronize
72-
- reopened
73-
- closed
74-
branches:
75-
- main
76-
77-
# Avoid conflicting workflow triggers.
78-
# For example, wait to trigger apply until plan has been triggered
79-
concurrency:
80-
group: "${{ github.ref }}"
81-
cancel-in-progress: false
82-
83-
permissions:
84-
id-token: write # This is required for requesting the JWT (OIDC) token
85-
contents: read # This is required for actions/checkout
86-
87-
jobs:
88-
affected:
89-
name: Trigger Affected Stacks
90-
91-
runs-on:
92-
- "runs-on=${{ github.run_id }}"
93-
- "runner=small"
94-
- "tag=affected-stacks"
95-
- "private=false"
96-
97-
# Trigger Atmos Pro for Pull Request plan events and specifically closed PRs that have been merged (not just closed)
98-
if: github.event.action != 'closed' || (github.event.action == 'closed' && github.event.pull_request.merged == true)
99-
100-
steps:
101-
- uses: runs-on/action@v1
102-
- name: Checkout
103-
# For merged PRs, we will need to checkout the base branch to get the correct base branch SHA.
104-
# This isn't necessary for other events.
105-
if: github.event.action == 'closed'
106-
uses: actions/checkout@v4
107-
with:
108-
=======
109-
>>>>>>> 525f355ffc4471dbb3988fdb48edc3d1b84efc13
11050
fetch-depth: 0 # Fetch all history for all branches and tags
11151

11252
# For merged PRs, we want to use 1 previous commit from the base branch SHA
@@ -140,8 +80,3 @@ jobs:
14080
# If the PR is merged, compare the head of the PR to 1 previous commit on the base branch.
14181
head-ref: ${{ github.event.pull_request.head.sha }}
14282
base-ref: ${{ github.event.action == 'closed' && steps.get_parent.outputs.parent_commit || github.event.pull_request.base.sha }}
143-
<<<<<<< HEAD
144-
>>>>>>> master
145-
=======
146-
147-
>>>>>>> 525f355ffc4471dbb3988fdb48edc3d1b84efc13

‎examples/snippets/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
ARG GEODESIC_VERSION=4.3.0
33
ARG GEODESIC_OS=debian
44
# https://github.com/cloudposse/atmos
5-
ARG ATMOS_VERSION=1.179.0
6-
# This should match the version set in stacks/catalog/spacelift.yaml
5+
ARG ATMOS_VERSION=1.180.0
76
# This should match the version set in .github/workflows/auto-format.yaml
87
ARG TF_1_VERSION=1.5.7
98
ARG TOFU_VERSION=1.8.8

0 commit comments

Comments
 (0)