Fix arch is undefined, update tests, and allow manual invocation of action by r-LaForge · Pull Request #8 · earthly/actions-setup

r-LaForge · 2022-09-20T17:11:02Z

Fix arch is undefined, update tests, and allow manual invocation of action.

r-LaForge · 2022-09-20T20:53:09Z

Earthfile

+    RUN export PATH="$(cat earthly-path):$PATH" && earthly --version
+    RUN export PATH="$(cat earthly-path):$PATH" && earthly --version | grep '^earthly version v.* [a-zA-Z0-9]* linux/amd64; Alpine Linux'


Running as a separate command simply makes it easier to see the version to make the necessary changes. This test relies on the specific format of our version command.

r-LaForge · 2022-09-20T20:54:02Z

src/lib/__tests__/__snapshots__/get-version.test.ts.snap

+exports[`get-version range versions should match ^0 versions 1`] = `"v0.6.23"`;

-exports[`get-version range versions should match 0.*.* versions 1`] = `"v0.6.14"`;
+exports[`get-version range versions should match 0.*.* versions 1`] = `"v0.6.23"`;

 exports[`get-version range versions should match 0.4.* versions 1`] = `"v0.4.6"`;

 exports[`get-version range versions should match 0.6.1 versions 1`] = `"v0.6.1"`;

 exports[`get-version range versions should match 0.6.1 versions 2`] = `"v0.6.1"`;

-exports[`get-version range versions should match latest versions 1`] = `"v0.6.14"`;
+exports[`get-version range versions should match latest versions 1`] = `"v0.6.23"`;


snapshots depend on the current version of Earthly. They need to be updated every time we do work after releasing a new version.

ouch!

Maybe we should parse the string into [0, 6, 23] then we can just programatically check that it's greater than [0,6,1].

I decided to use semver for this. Made the tests very straightforward.

r-LaForge · 2022-09-20T20:54:14Z

src/setup-earthly.ts

+    const osArch = os.arch();
+    const releaseArch = nodeArchToReleaseArch[os.arch()] || osArch;


When the osArch wasn't in the map we got undefined and cached linux-undefined.

.gitignore

alexcb · 2022-09-20T21:05:43Z

Earthfile

-    RUN export PATH="$(cat earthly-path):$PATH" && earthly --version | grep '^earthly version v.*linux/amd64; Linux'
+    # [a-zA-Z0-9]* attempt to match a commit hash
+    RUN export PATH="$(cat earthly-path):$PATH" && earthly --version
+    RUN export PATH="$(cat earthly-path):$PATH" && earthly --version | grep '^earthly version v.* [a-zA-Z0-9]* linux/amd64; Alpine Linux'


it looks like this regex now requires two spaces for cases like v0.1.2<space><space>linux/amd64

should it be something closer to:

Suggested change

RUN export PATH="$(cat earthly-path):$PATH" && earthly --version | grep '^earthly version v.* [a-zA-Z0-9]* linux/amd64; Alpine Linux'

RUN export PATH="$(cat earthly-path):$PATH" && earthly --version | grep '^earthly version v.*( [a-zA-Z0-9]+)? linux/amd64; Alpine Linux'

However note that there's already a .* should should match everything between v and linux/amd64, so I'm not sure about this regex change.

What about:

RUN export PATH="$(cat earthly-path):$PATH" && earthly --version | tee version.output RUN grep '^earthly version v.*linux/amd64; Linux' version.output

instead?

This is very close.
I've adjusted the regex you've provided just a bit to allow for the specific flavour of Linux as well (Alpine in this example).

RUN grep '^earthly version v.*linux/amd64; Alpine Linux' version.output

alexcb

looking good!

I left a couple of small suggestions to make this more manageable in the future.

alexcb · 2022-09-20T22:53:02Z

Earthfile

    RUN cat output | grep '^::add-path::' | sed 's/::add-path:://g' > earthly-path
    RUN test "$(cat earthly-path)" = "/root/.earthly/bin"
-    RUN export PATH="$(cat earthly-path):$PATH" && earthly --version | grep '^earthly version v.*linux/amd64; Linux'
+    # [a-zA-Z0-9]* attempt to match a commit hash


is this comment still relevant?

r-LaForge added 7 commits September 20, 2022 10:58

[ci]: Add workflow_dispatch event to allow running manually

b2f586f

[fix]: update jest snapshots to latest version

1505ced

[ci]: Add GitHub token when running CI

a85c5cc

[fix]: update test to new format of earthly version command

00f88e4

[chore]: run earthly +compile

7bc67ec

[fix]: try swapping back to amd64

d676a17

[ci]: make all checkout actions use the token

af0174d

r-LaForge commented Sep 20, 2022

View reviewed changes

r-LaForge changed the title ~~[ci]: Add workflow_dispatch event to allow running manually~~ Fix arch is undefined, update tests, and allow manual invocation of action Sep 20, 2022

r-LaForge requested a review from alexcb September 20, 2022 20:57

alexcb reviewed Sep 20, 2022

View reviewed changes

.gitignore Outdated Show resolved Hide resolved

alexcb reviewed Sep 20, 2022

View reviewed changes

r-LaForge added 3 commits September 20, 2022 15:59

[revert]: undo change to .gitignore

6328f16

[revert]: Remove snapshot tests and use semver comparison instead

c8ce490

[ci]: patch version regexp

ada8a87

r-LaForge requested a review from alexcb September 20, 2022 22:11

r-LaForge added 3 commits September 20, 2022 16:12

[chore]: actually use the version string

4e03379

[ci]: add GITHUB_TOKEN env variable to prevent rate limiting

0191197

[test]: ensure we are checking for less than as well

e7fbd54

alexcb reviewed Sep 20, 2022

View reviewed changes

alexcb approved these changes Sep 20, 2022

View reviewed changes

r-LaForge merged commit c2d4f80 into main Sep 20, 2022

r-LaForge deleted the ryan/enable-running-gha-manually branch September 20, 2022 23:00

renovate bot mentioned this pull request Sep 30, 2025

Update Node.js to v22 #105

Open

1 task

renovate bot mentioned this pull request Apr 8, 2026

Update typescript-eslint monorepo to v8 (major) #104

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix arch is undefined, update tests, and allow manual invocation of action#8

Fix arch is undefined, update tests, and allow manual invocation of action#8
r-LaForge merged 13 commits intomainfrom
ryan/enable-running-gha-manually

r-LaForge commented Sep 20, 2022 •

edited

Loading

Uh oh!

r-LaForge Sep 20, 2022

Uh oh!

r-LaForge Sep 20, 2022

Uh oh!

alexcb Sep 20, 2022

Uh oh!

r-LaForge Sep 20, 2022

Uh oh!

r-LaForge Sep 20, 2022

Uh oh!

Uh oh!

alexcb Sep 20, 2022

Uh oh!

r-LaForge Sep 20, 2022 •

edited

Loading

Uh oh!

alexcb left a comment

Uh oh!

alexcb Sep 20, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		RUN export PATH="$(cat earthly-path):$PATH" && earthly --version
		RUN export PATH="$(cat earthly-path):$PATH" && earthly --version \| grep '^earthly version v.* [a-zA-Z0-9]* linux/amd64; Alpine Linux'

		const osArch = os.arch();
		const releaseArch = nodeArchToReleaseArch[os.arch()] \|\| osArch;

Conversation

r-LaForge commented Sep 20, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

r-LaForge Sep 20, 2022

Choose a reason for hiding this comment

Uh oh!

r-LaForge Sep 20, 2022

Choose a reason for hiding this comment

Uh oh!

alexcb Sep 20, 2022

Choose a reason for hiding this comment

Uh oh!

r-LaForge Sep 20, 2022

Choose a reason for hiding this comment

Uh oh!

r-LaForge Sep 20, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

alexcb Sep 20, 2022

Choose a reason for hiding this comment

Uh oh!

r-LaForge Sep 20, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alexcb left a comment

Choose a reason for hiding this comment

Uh oh!

alexcb Sep 20, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

r-LaForge commented Sep 20, 2022 •

edited

Loading

r-LaForge Sep 20, 2022 •

edited

Loading