Skip to content

Commit 85381be

Browse files
authored
Merge branch 'master' into cloudguard-integrations-terraform-aws-cloudguard-network-securi-dfb3cbe671806b3fa5fcb8fecc002de517776c83
2 parents 0056320 + 5846907 commit 85381be

File tree

3 files changed

+23
-41
lines changed

3 files changed

+23
-41
lines changed

.github/workflows/main.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Delete Merged Branch
2+
3+
on:
4+
pull_request:
5+
types:
6+
- closed
7+
8+
jobs:
9+
delete_branch:
10+
if: github.event.pull_request.merged == true
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: write
14+
steps:
15+
- name: Checkout code
16+
uses: actions/checkout@v4
17+
with:
18+
ref: ${{ github.event.pull_request.base.ref }} # Checkout the target branch
19+
20+
- name: Delete source branch
21+
run: |
22+
git push origin --delete ${{ github.event.pull_request.head.ref }}

modules/autoscale_gwlb/asg_userdata_ipv6.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ bootcmd:
3030
- /etc/rc3.d/S07ipv6gen
3131
runcmd:
3232
- |
33-
python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" installationType=\"autoscale\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"20231012\" templateName=\"autoscale_gwlb\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" bootstrapScript64=\"${BootstrapScript}\"
33+
python3 /etc/cloud_config.py enableCloudWatch=\"${EnableCloudWatch}\" sicKey=\"${SICKey}\" installationType=\"autoscale\" osVersion=\"${OsVersion}\" allowUploadDownload=\"${AllowUploadDownload}\" templateVersion=\"20231012\" templateName=\"autoscale_gwlb\" templateType=\"terraform_registry\" shell=\"${Shell}\" enableInstanceConnect=\"${EnableInstanceConnect}\" passwordHash=\"${PasswordHash}\" MaintenanceModePassword=\"${MaintenanceModePassword}\" bootstrapScript64=\"${BootstrapScript}\"

sonar-project.properties

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)