Skip to content

Commit 8fca629

Browse files
bryantbiggsbryantbiggs
authored
fix: Update CI workflow versions to latest (#43)
1 parent 0ddd4c6 commit 8fca629

File tree

25 files changed

+198
-213
lines changed

25 files changed

+198
-213
lines changed

‎.github/workflows/pr-title.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
# Please look up the latest version from
1616
# https://github.com/amannn/action-semantic-pull-request/releases
17-
- uses: amannn/action-semantic-pull-request@v5.5.3
17+
- uses: amannn/action-semantic-pull-request@v6.1.1
1818
env:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2020
with:

‎.github/workflows/pre-commit.yml‎

Lines changed: 90 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
- master
88

99
env:
10-
TERRAFORM_DOCS_VERSION: v0.19.0
11-
TFLINT_VERSION: v0.53.0
10+
TERRAFORM_DOCS_VERSION: v0.20.0
11+
TFLINT_VERSION: v0.59.1
1212

1313
jobs:
1414
collectInputs:
@@ -18,11 +18,11 @@ jobs:
1818
directories: ${{ steps.dirs.outputs.directories }}
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222

2323
- name: Get root directories
2424
id: dirs
25-
uses: clowdhaus/terraform-composite-actions/directories@v1.9.0
25+
uses: clowdhaus/terraform-composite-actions/directories@v1.14.0
2626

2727
preCommitMinVersions:
2828
name: Min TF pre-commit
@@ -32,27 +32,49 @@ jobs:
3232
matrix:
3333
directory: ${{ fromJson(needs.collectInputs.outputs.directories) }}
3434
steps:
35+
- name: Install rmz
36+
uses: jaxxstorm/[email protected]
37+
with:
38+
repo: SUPERCILEX/fuc
39+
asset-name: x86_64-unknown-linux-gnu-rmz
40+
rename-to: rmz
41+
chmod: 0755
42+
extension-matching: disable
43+
3544
# https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
36-
- name: Delete huge unnecessary tools folder
45+
- name: Delete unnecessary files
3746
run: |
38-
rm -rf /opt/hostedtoolcache/CodeQL
39-
rm -rf /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk
40-
rm -rf /opt/hostedtoolcache/Ruby
41-
rm -rf /opt/hostedtoolcache/go
47+
formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000'); }
48+
getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
49+
50+
BEFORE=$(getAvailableSpace)
51+
52+
ln -s /opt/hostedtoolcache/SUPERCILEX/x86_64-unknown-linux-gnu-rmz/latest/linux-x64/rmz /usr/local/bin/rmz
53+
rmz -f /opt/hostedtoolcache/CodeQL &
54+
rmz -f /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk &
55+
rmz -f /opt/hostedtoolcache/PyPy &
56+
rmz -f /opt/hostedtoolcache/Ruby &
57+
rmz -f /opt/hostedtoolcache/go &
58+
59+
wait
60+
61+
AFTER=$(getAvailableSpace)
62+
SAVED=$((AFTER-BEFORE))
63+
echo "=> Saved $(formatByteCount $SAVED)"
4264
4365
- name: Checkout
44-
uses: actions/checkout@v4
66+
uses: actions/checkout@v5
4567

4668
- name: Terraform min/max versions
4769
id: minMax
48-
uses: clowdhaus/terraform-min-max@v1.3.1
70+
uses: clowdhaus/terraform-min-max@v2.1.0
4971
with:
5072
directory: ${{ matrix.directory }}
5173

5274
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
5375
# Run only validate pre-commit check on min version supported
5476
if: ${{ matrix.directory != '.' }}
55-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
77+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.14.0
5678
with:
5779
terraform-version: ${{ steps.minMax.outputs.minVersion }}
5880
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -61,7 +83,7 @@ jobs:
6183
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
6284
# Run only validate pre-commit check on min version supported
6385
if: ${{ matrix.directory == '.' }}
64-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
86+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.14.0
6587
with:
6688
terraform-version: ${{ steps.minMax.outputs.minVersion }}
6789
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -72,26 +94,73 @@ jobs:
7294
runs-on: ubuntu-latest
7395
needs: collectInputs
7496
steps:
97+
- name: Install rmz
98+
uses: jaxxstorm/[email protected]
99+
with:
100+
repo: SUPERCILEX/fuc
101+
asset-name: x86_64-unknown-linux-gnu-rmz
102+
rename-to: rmz
103+
chmod: 0755
104+
extension-matching: disable
105+
75106
# https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
76-
- name: Delete huge unnecessary tools folder
107+
- name: Delete unnecessary files
77108
run: |
78-
rm -rf /opt/hostedtoolcache/CodeQL
79-
rm -rf /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk
80-
rm -rf /opt/hostedtoolcache/Ruby
81-
rm -rf /opt/hostedtoolcache/go
109+
formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000'); }
110+
getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
111+
112+
BEFORE=$(getAvailableSpace)
113+
114+
ln -s /opt/hostedtoolcache/SUPERCILEX/x86_64-unknown-linux-gnu-rmz/latest/linux-x64/rmz /usr/local/bin/rmz
115+
rmz -f /opt/hostedtoolcache/CodeQL &
116+
rmz -f /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk &
117+
rmz -f /opt/hostedtoolcache/PyPy &
118+
rmz -f /opt/hostedtoolcache/Ruby &
119+
rmz -f /opt/hostedtoolcache/go &
120+
sudo rmz -f /usr/local/lib/android &
121+
122+
if [[ ${{ github.repository }} == terraform-aws-modules/terraform-aws-security-group ]]; then
123+
sudo rmz -f /usr/share/dotnet &
124+
sudo rmz -f /usr/local/.ghcup &
125+
sudo apt-get -qq remove -y 'azure-.*'
126+
sudo apt-get -qq remove -y 'cpp-.*'
127+
sudo apt-get -qq remove -y 'dotnet-runtime-.*'
128+
sudo apt-get -qq remove -y 'google-.*'
129+
sudo apt-get -qq remove -y 'libclang-.*'
130+
sudo apt-get -qq remove -y 'libllvm.*'
131+
sudo apt-get -qq remove -y 'llvm-.*'
132+
sudo apt-get -qq remove -y 'mysql-.*'
133+
sudo apt-get -qq remove -y 'postgresql-.*'
134+
sudo apt-get -qq remove -y 'php.*'
135+
sudo apt-get -qq remove -y 'temurin-.*'
136+
sudo apt-get -qq remove -y kubectl firefox mono-devel
137+
sudo apt-get -qq autoremove -y
138+
sudo apt-get -qq clean
139+
fi
140+
141+
wait
142+
143+
AFTER=$(getAvailableSpace)
144+
SAVED=$((AFTER-BEFORE))
145+
echo "=> Saved $(formatByteCount $SAVED)"
82146
83147
- name: Checkout
84-
uses: actions/checkout@v4
148+
uses: actions/checkout@v5
85149
with:
86150
ref: ${{ github.event.pull_request.head.ref }}
87151
repository: ${{github.event.pull_request.head.repo.full_name}}
88152

89153
- name: Terraform min/max versions
90154
id: minMax
91-
uses: clowdhaus/[email protected]
155+
uses: clowdhaus/[email protected]
156+
157+
- name: Hide template dir
158+
# Special to this repo, we don't want to check this dir
159+
if: ${{ github.repository == 'terraform-aws-modules/terraform-aws-security-group' }}
160+
run: rm -rf modules/_templates
92161

93162
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
94-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
163+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.14.0
95164
with:
96165
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
97166
tflint-version: ${{ env.TFLINT_VERSION }}

‎.github/workflows/release.yml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,26 @@ jobs:
2020
if: github.repository_owner == 'terraform-aws-modules'
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424
with:
2525
persist-credentials: false
2626
fetch-depth: 0
2727

28+
- name: Set correct Node.js version
29+
uses: actions/setup-node@v6
30+
with:
31+
node-version: 24
32+
33+
- name: Install dependencies
34+
run: |
35+
npm install \
36+
@semantic-release/[email protected] \
37+
@semantic-release/[email protected] \
38+
[email protected]
39+
2840
- name: Release
29-
uses: cycjimmy/semantic-release-action@v4
41+
uses: cycjimmy/semantic-release-action@v5
3042
with:
31-
semantic_version: 23.0.2
32-
extra_plugins: |
33-
@semantic-release/[email protected]
34-
@semantic-release/[email protected]
35-
[email protected]
43+
semantic_version: 25.0.0
3644
env:
3745
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}

‎.github/workflows/stale-actions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
stale:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/stale@v9
10+
- uses: actions/stale@v10
1111
with:
1212
repo-token: ${{ secrets.GITHUB_TOKEN }}
1313
# Staling issues and PR's

‎.gitignore‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
# Local .terraform directories
22
**/.terraform/*
33

4+
# Terraform lockfile
5+
.terraform.lock.hcl
6+
47
# .tfstate files
58
*.tfstate
69
*.tfstate.*
710

8-
# terraform lockfile
9-
.terraform.lock.hcl
10-
1111
# Crash log files
1212
crash.log
1313

1414
# Exclude all .tfvars files, which are likely to contain sentitive data, such as
1515
# password, private keys, and other secrets. These should not be part of version
1616
# control as they are data points which are potentially sensitive and subject
1717
# to change depending on the environment.
18-
#
1918
*.tfvars
2019

2120
# Ignore override files as they are usually used to override resources locally and so
@@ -25,13 +24,16 @@ override.tf.json
2524
*_override.tf
2625
*_override.tf.json
2726

28-
# Include override files you do wish to add to version control using negated pattern
29-
#
30-
# !example_override.tf
31-
32-
# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
33-
# example: *tfplan*
34-
3527
# Ignore CLI configuration files
3628
.terraformrc
3729
terraform.rc
30+
31+
# Lambda build artifacts
32+
builds/
33+
__pycache__/
34+
*.zip
35+
.tox
36+
37+
# Local editors/macos files
38+
.DS_Store
39+
.idea

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.99.1
3+
rev: v1.103.0
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_docs
@@ -23,7 +23,7 @@ repos:
2323
- '--args=--only=terraform_workspace_remote'
2424
- id: terraform_validate
2525
- repo: https://github.com/pre-commit/pre-commit-hooks
26-
rev: v5.0.0
26+
rev: v6.0.0
2727
hooks:
2828
- id: check-merge-conflict
2929
- id: end-of-file-fixer

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Terraform module which creates AWS EMR resources.
55
[![SWUbanner](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://github.com/vshymanskyy/StandWithUkraine/blob/main/docs/README.md)
66

77
This module supports the creation of:
8+
89
- EMR clusters using instance fleets or instance groups deployed in public or private subnets
910
- EMR Virtual clusters that run on Amazon EKS
1011
- EMR Serverless clusters
@@ -13,7 +14,8 @@ This module supports the creation of:
1314
- Security group for EMR `service` to support private clusters
1415
- IAM roles for autoscaling, EMR `service`, and EC2 instance profiles
1516

16-
:information_source: The appropriate resources have been tagged with `{ "for-use-with-amazon-emr-managed-policies" = true }` to support the use of the recommended IAM policy `"arn:aws:iam::aws:policy/service-role/AmazonEMRServicePolicy_v2"`. Users are required to tag the appropriate VPC resources (VPC and subnets) as needed. See [here](https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-managed-iam-policies.html) for more details regarding v2 of managed EMR policies and their usage requirements.
17+
> [!IMPORTANT]
18+
> The appropriate resources have been tagged with `{ "for-use-with-amazon-emr-managed-policies" = true }` to support the use of the recommended IAM policy `"arn:aws:iam::aws:policy/service-role/AmazonEMRServicePolicy_v2"`. Users are required to tag the appropriate VPC resources (VPC and subnets) as needed. See [here](https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-managed-iam-policies.html) for more details regarding v2 of managed EMR policies and their usage requirements.
1719
1820
## Usage
1921

‎examples/private-cluster/README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Note that this example may create resources which will incur monetary charges on
2727

2828
| Name | Version |
2929
|------|---------|
30-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
30+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
3131
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.83 |
3232

3333
## Providers
@@ -43,9 +43,9 @@ Note that this example may create resources which will incur monetary charges on
4343
| <a name="module_emr_disabled"></a> [emr\_disabled](#module\_emr\_disabled) | ../.. | n/a |
4444
| <a name="module_emr_instance_fleet"></a> [emr\_instance\_fleet](#module\_emr\_instance\_fleet) | ../.. | n/a |
4545
| <a name="module_emr_instance_group"></a> [emr\_instance\_group](#module\_emr\_instance\_group) | ../.. | n/a |
46-
| <a name="module_s3_bucket"></a> [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 4.0 |
47-
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
48-
| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 5.0 |
46+
| <a name="module_s3_bucket"></a> [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 5.0 |
47+
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 |
48+
| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 6.0 |
4949
| <a name="module_vpc_endpoints_sg"></a> [vpc\_endpoints\_sg](#module\_vpc\_endpoints\_sg) | terraform-aws-modules/security-group/aws | ~> 5.0 |
5050

5151
## Resources
@@ -62,7 +62,6 @@ Note that this example may create resources which will incur monetary charges on
6262
| [aws_iam_policy_document.assume](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
6363
| [aws_iam_policy_document.autoscaling](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
6464
| [aws_partition.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/partition) | data source |
65-
| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
6665

6766
## Inputs
6867

0 commit comments

Comments
 (0)