Skip to content

Commit 87c3580

Browse files
committed
always remove and readd repos
1 parent 3df903d commit 87c3580

File tree

7 files changed

+97
-55
lines changed

7 files changed

+97
-55
lines changed

dist/index.cjs

Lines changed: 15 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147638,9 +147638,16 @@ async function repositoryRemoveAll() {
147638147638
});
147639147639
}
147640147640
async function update() {
147641-
await lib_core.group("Updating opam repositories", async () => {
147642-
await (0,lib_exec.exec)("opam", ["update"]);
147643-
});
147641+
try {
147642+
await lib_core.group("Updating opam repositories", async () => {
147643+
await (0,lib_exec.exec)("opam", ["update"]);
147644+
});
147645+
}
147646+
catch (error) {
147647+
if (error instanceof Error) {
147648+
lib_core.notice(`Failed to update opam. Error details: ${error.message.toLocaleLowerCase()}`);
147649+
}
147650+
}
147644147651
}
147645147652

147646147653
;// CONCATENATED MODULE: ./src/version.ts
@@ -166493,9 +166500,9 @@ async function installer() {
166493166500
lib_core.addPath(CYGWIN_ROOT_BIN);
166494166501
}
166495166502
await setupOpam();
166503+
await repositoryRemoveAll();
166504+
await repositoryAddAll(OPAM_REPOSITORIES);
166496166505
if (!opamCacheHit) {
166497-
await repositoryRemoveAll();
166498-
await repositoryAddAll(OPAM_REPOSITORIES);
166499166506
const ocamlCompiler = await resolvedCompiler;
166500166507
await installOcaml(ocamlCompiler);
166501166508
if (!SAVE_OPAM_POST_RUN) {

dist/post/index.cjs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/post/index.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114731,9 +114731,16 @@ async function repositoryRemoveAll() {
114731114731
});
114732114732
}
114733114733
async function update() {
114734-
await core.group("Updating opam repositories", async () => {
114735-
await exec("opam", ["update"]);
114736-
});
114734+
try {
114735+
await core.group("Updating opam repositories", async () => {
114736+
await exec("opam", ["update"]);
114737+
});
114738+
}
114739+
catch (error) {
114740+
if (error instanceof Error) {
114741+
core.notice(`Failed to update opam. Error details: ${error.message.toLocaleLowerCase()}`);
114742+
}
114743+
}
114737114744
}
114738114745

114739114746
;// CONCATENATED MODULE: ./src/version.ts

packages/setup-ocaml/src/installer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ export async function installer() {
7676
core.addPath(CYGWIN_ROOT_BIN);
7777
}
7878
await setupOpam();
79+
await repositoryRemoveAll();
80+
await repositoryAddAll(OPAM_REPOSITORIES);
7981
if (!opamCacheHit) {
80-
await repositoryRemoveAll();
81-
await repositoryAddAll(OPAM_REPOSITORIES);
8282
const ocamlCompiler = await resolvedCompiler;
8383
await installOcaml(ocamlCompiler);
8484
if (!SAVE_OPAM_POST_RUN) {

packages/setup-ocaml/src/opam.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,15 @@ export async function repositoryRemoveAll() {
200200
}
201201

202202
export async function update() {
203-
await core.group("Updating opam repositories", async () => {
204-
await exec("opam", ["update"]);
205-
});
203+
try {
204+
await core.group("Updating opam repositories", async () => {
205+
await exec("opam", ["update"]);
206+
})
207+
} catch (error) {
208+
if (error instanceof Error) {
209+
core.notice(
210+
`Failed to update opam. Error details: ${error.message.toLocaleLowerCase()}`,
211+
);
212+
}
213+
}
206214
}

yarn.lock

Lines changed: 45 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -640,33 +640,6 @@ __metadata:
640640
languageName: unknown
641641
linkType: soft
642642

643-
"@ocaml/setup-ocaml@workspace:packages/setup-ocaml":
644-
version: 0.0.0-use.local
645-
resolution: "@ocaml/setup-ocaml@workspace:packages/setup-ocaml"
646-
dependencies:
647-
"@actions/cache": "npm:4.0.3"
648-
"@actions/core": "npm:1.11.1"
649-
"@actions/exec": "npm:1.1.1"
650-
"@actions/github": "npm:6.0.1"
651-
"@actions/glob": "npm:0.5.0"
652-
"@actions/http-client": "npm:2.2.3"
653-
"@actions/io": "npm:1.1.3"
654-
"@actions/tool-cache": "npm:2.0.2"
655-
"@octokit/plugin-retry": "npm:8.0.1"
656-
"@tsconfig/node20": "npm:20.1.5"
657-
"@tsconfig/strictest": "npm:2.0.5"
658-
"@types/node": "npm:22.15.21"
659-
"@types/semver": "npm:7.7.0"
660-
cheerio: "npm:1.0.0"
661-
esbuild: "npm:0.25.5"
662-
exponential-backoff: "npm:3.1.2"
663-
semver: "npm:7.7.2"
664-
systeminformation: "npm:5.27.1"
665-
typescript: "npm:5.8.3"
666-
yaml: "npm:2.8.0"
667-
languageName: unknown
668-
linkType: soft
669-
670643
"@octokit/auth-token@npm:^4.0.0":
671644
version: 4.0.0
672645
resolution: "@octokit/auth-token@npm:4.0.0"
@@ -778,11 +751,11 @@ __metadata:
778751
linkType: hard
779752

780753
"@octokit/request-error@npm:^6.1.1":
781-
version: 6.1.8
782-
resolution: "@octokit/request-error@npm:6.1.8"
754+
version: 6.1.7
755+
resolution: "@octokit/request-error@npm:6.1.7"
783756
dependencies:
784-
"@octokit/types": "npm:^14.0.0"
785-
checksum: 10c0/02aa5bfebb5b1b9e152558b4a6f4f7dcb149b41538778ffe0fce3395fd0da5c0862311a78e94723435667581b2a58a7cefa458cf7aa19ae2948ae419276f7ee1
757+
"@octokit/types": "npm:^13.6.2"
758+
checksum: 10c0/24bd6f98b1d7b2d4062de34777b4195d3cc4dc40c3187a0321dd588291ec5e13b5760765aacdef3a73796a529d3dec0bfb820780be6ef526a3e774d13566b5b0
786759
languageName: node
787760
linkType: hard
788761

@@ -816,7 +789,7 @@ __metadata:
816789
languageName: node
817790
linkType: hard
818791

819-
"@octokit/types@npm:^13.0.0, @octokit/types@npm:^13.1.0":
792+
"@octokit/types@npm:^13.0.0, @octokit/types@npm:^13.1.0, @octokit/types@npm:^13.6.2":
820793
version: 13.10.0
821794
resolution: "@octokit/types@npm:13.10.0"
822795
dependencies:
@@ -883,6 +856,33 @@ __metadata:
883856
languageName: node
884857
linkType: hard
885858

859+
"@semgrep/setup-ocaml@workspace:packages/setup-ocaml":
860+
version: 0.0.0-use.local
861+
resolution: "@semgrep/setup-ocaml@workspace:packages/setup-ocaml"
862+
dependencies:
863+
"@actions/cache": "npm:4.0.3"
864+
"@actions/core": "npm:1.11.1"
865+
"@actions/exec": "npm:1.1.1"
866+
"@actions/github": "npm:6.0.1"
867+
"@actions/glob": "npm:0.5.0"
868+
"@actions/http-client": "npm:2.2.3"
869+
"@actions/io": "npm:1.1.3"
870+
"@actions/tool-cache": "npm:2.0.2"
871+
"@octokit/plugin-retry": "npm:8.0.1"
872+
"@tsconfig/node20": "npm:20.1.5"
873+
"@tsconfig/strictest": "npm:2.0.5"
874+
"@types/node": "npm:22.15.21"
875+
"@types/semver": "npm:7.7.0"
876+
cheerio: "npm:1.0.0"
877+
esbuild: "npm:0.25.5"
878+
exponential-backoff: "npm:3.1.2"
879+
semver: "npm:7.7.2"
880+
systeminformation: "npm:5.27.1"
881+
typescript: "npm:5.8.3"
882+
yaml: "npm:2.8.0"
883+
languageName: unknown
884+
linkType: soft
885+
886886
"@tsconfig/node20@npm:20.1.5":
887887
version: 20.1.5
888888
resolution: "@tsconfig/node20@npm:20.1.5"
@@ -1082,7 +1082,19 @@ __metadata:
10821082
languageName: node
10831083
linkType: hard
10841084

1085-
"debug@npm:4, debug@npm:^4.1.1, debug@npm:^4.3.4":
1085+
"debug@npm:4, debug@npm:^4.3.4":
1086+
version: 4.4.0
1087+
resolution: "debug@npm:4.4.0"
1088+
dependencies:
1089+
ms: "npm:^2.1.3"
1090+
peerDependenciesMeta:
1091+
supports-color:
1092+
optional: true
1093+
checksum: 10c0/db94f1a182bf886f57b4755f85b3a74c39b5114b9377b7ab375dc2cfa3454f09490cc6c30f829df3fc8042bc8b8995f6567ce5cd96f3bc3688bd24027197d9de
1094+
languageName: node
1095+
linkType: hard
1096+
1097+
"debug@npm:^4.1.1":
10861098
version: 4.4.1
10871099
resolution: "debug@npm:4.4.1"
10881100
dependencies:

0 commit comments

Comments
 (0)