Skip to content

fix(ci): build-key hotfix #6123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ludamad merged 9 commits into from
May 1, 2024
Merged

fix(ci): build-key hotfix #6123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
704af19
chore(ci): fix spot runner build key
ludamad May 1, 2024
c56ece4
Merge branch 'master' into ad/chore/ci/buildkey
ludamad May 1, 2024
69bc2e8
push build
ludamad May 1, 2024
12a41d6
Merge remote-tracking branch 'origin/ad/chore/ci/buildkey' into ad/ch…
ludamad May 1, 2024
70c6cd9
simplify
ludamad May 1, 2024
96d0997
clarify
ludamad May 1, 2024
e786a63
bundle a workaround
ludamad May 1, 2024
a1348ef
build
ludamad May 1, 2024
9b17e98
Merge branch 'master' into ad/chore/ci/buildkey
ludamad May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/spot-runner-action/dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ class Ec2Instance {
const client = yield this.getEc2Client();
// NOTE: This should be deterministic or we will create a launch template each time
const userData = yield new userdata_1.UserData(this.config).getUserData();
const ec2InstanceTypeHash = this.getHashOfStringArray(this.config.ec2InstanceType.concat([userData]).concat([JSON.stringify(this.tags)]));
const ec2InstanceTypeHash = this.getHashOfStringArray(this.config.ec2InstanceType.concat([userData, JSON.stringify(this.tags), this.config.ec2KeyName]));
const launchTemplateName = "aztec-packages-spot-" + this.config.ec2AmiId + "-" + ec2InstanceTypeHash;
const launchTemplateParams = {
LaunchTemplateName: launchTemplateName,
Expand All @@ -258,6 +258,7 @@ class Ec2Instance {
MemoryMiB: { Min: 0 },
AllowedInstanceTypes: this.config.ec2InstanceType,
},
KeyName: this.config.ec2KeyName,
UserData: userData,
TagSpecifications: [
{
Expand Down
3 changes: 2 additions & 1 deletion .github/spot-runner-action/src/ec2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export class Ec2Instance {
// NOTE: This should be deterministic or we will create a launch template each time
const userData = await new UserData(this.config).getUserData();
const ec2InstanceTypeHash = this.getHashOfStringArray(
this.config.ec2InstanceType.concat([userData]).concat([JSON.stringify(this.tags)])
this.config.ec2InstanceType.concat([userData, JSON.stringify(this.tags), this.config.ec2KeyName])
);
const launchTemplateName =
"aztec-packages-spot-" + this.config.ec2AmiId + "-" + ec2InstanceTypeHash;
Expand All @@ -177,6 +177,7 @@ export class Ec2Instance {
MemoryMiB: { Min: 0 },
AllowedInstanceTypes: this.config.ec2InstanceType,
},
KeyName: this.config.ec2KeyName,
UserData: userData,
TagSpecifications: [
{
Expand Down