Skip to content

Commit 35c42e7

Browse files
committed
Merge branch 'main' into change-daily-scan
2 parents 5ebe31b + bfc7638 commit 35c42e7

File tree

8 files changed

+4
-4
lines changed

8 files changed

+4
-4
lines changed
File renamed without changes.
File renamed without changes.

.github/workflows/post_release_version_bump.yml renamed to .github/workflows/post-release-version-bump.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ jobs:
9999
sed -i "s/public static string version = \".*\";/public static string version = \"${DEV_VERSION}\";/" src/AWS.Distro.OpenTelemetry.AutoInstrumentation/Version.cs
100100
sed -i "s/private readonly string version = \".*\";/private readonly string version = \"${DEV_VERSION}\";/" build/Build.InstallationScripts.cs
101101
VERSION="${{ github.event.inputs.version }}"
102-
sed -i -e 's/dotnet:v.*"/dotnet:v'$VERSION'"/' .github/workflows/daily_scan.yml
102+
sed -i -e 's/dotnet:v.*"/dotnet:v'$VERSION'"/' .github/workflows/daily-scan.yml
103103
git add src/AWS.Distro.OpenTelemetry.AutoInstrumentation/Version.cs
104104
git add build/Build.InstallationScripts.cs
105-
git add .github/workflows/daily_scan.yml
105+
git add .github/workflows/daily-scan.yml
106106
git commit -m "Prepare main for next development cycle: Update version to $DEV_VERSION"
107107
git push --set-upstream origin "prepare-main-for-next-dev-cycle-${VERSION}"
108108
File renamed without changes.

.github/workflows/release_build.yml renamed to .github/workflows/release-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
aws-region: [ 'us-east-1' ]
29-
uses: ./.github/workflows/main_build.yml
29+
uses: ./.github/workflows/main-build.yml
3030
secrets: inherit
3131
with:
3232
caller-workflow-name: 'release_build_workflow'

.github/workflows/release-lambda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
aws-region: [ 'us-east-1' ]
28-
uses: ./.github/workflows/main_build.yml
28+
uses: ./.github/workflows/main-build.yml
2929
secrets: inherit
3030
with:
3131
caller-workflow-name: 'release_lambda_workflow'

0 commit comments

Comments
 (0)