Skip to content

Commit 7123457

Browse files
sxmxtasxmxta
committed
增加 Linux 使用源码安装: aarch64,
1 parent 88c2317 commit 7123457

File tree

4 files changed

+38
-42
lines changed

4 files changed

+38
-42
lines changed

‎action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ inputs:
2323
required: false
2424
default: 'x64'
2525
source-install:
26-
description: 'Install using source code. For Linux'
26+
description: 'Install using source code. For Linux, Install Root Path: $RUNNER_WORKSPACE/lazarus'
2727
required: false
2828
default: false
2929

‎dist/main/index.js

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ class Lazarus {
346346
// Perform a repository update
347347
await (0, exec_1.exec)("sudo apt update");
348348
// linux arm64 和 linux x64 使用源码安装时
349-
if (this._Arch == 'arm64' || this._SourceInstall) {
349+
if (this._SourceInstall) {
350350
await this.sourceInstallLinux(cacheRestored);
351351
break;
352352
}
@@ -579,13 +579,10 @@ class Lazarus {
579579
// fpcName: fpc-3.2.2.%s-linux.tar
580580
// aarch64 | x86_64
581581
let tempArch = arch;
582-
if (tempArch == "x64") {
582+
if (arch == 'x64') {
583583
tempArch = "x86_64";
584584
}
585-
else if (tempArch == "arm64") {
586-
tempArch = "aarch64";
587-
}
588-
fpcName = fpcName.replace("%s", tempArch);
585+
fpcName = fpcName.replace("{arch}", tempArch);
589586
return fpcName;
590587
};
591588
let source = version_1.versions['source'];
@@ -664,22 +661,22 @@ class Lazarus {
664661
catch (error) {
665662
throw error;
666663
}
667-
core.info(`Run Install fpc & Lazarus`);
668-
try {
669-
core.info(`Run Install: apt-get install dependent`);
670-
await (0, exec_1.exec)("sudo apt-get update -q -y");
671-
await (0, exec_1.exec)("sudo apt-get install -q -y git");
672-
await (0, exec_1.exec)("sudo apt-get install -q -y make binutils build-essential gdb subversion zip unzip libx11-dev libgtk2.0-dev libgdk-pixbuf2.0-dev libcairo2-dev libpango1.0-dev libgtk-3-dev");
673-
// let fpcDirname = path.basename(fpcFilename, path.extname(fpcFilename));
674-
// core.info(`Run Install fpc: ${lazarusPath}/${fpcDirname}`);
675-
// await exec(`echo y | ./install.sh`, [], {cwd: `${lazarusPath}/${fpcDirname}`});
676-
//
677-
// core.info(`Run Install lazarus: ${lazarusPath}`);
678-
// await exec(`make clean all`, [], {cwd: lazarusPath});
679-
}
680-
catch (error) {
681-
throw error;
682-
}
664+
// core.info(`Run Install fpc & Lazarus`);
665+
// try {
666+
// core.info(`Run Install: apt-get install dependent`);
667+
// await exec("sudo apt-get update -q -y");
668+
// await exec("sudo apt-get install -q -y git");
669+
// await exec("sudo apt-get install -q -y make binutils build-essential gdb subversion zip unzip libx11-dev libgtk2.0-dev libgdk-pixbuf2.0-dev libcairo2-dev libpango1.0-dev libgtk-3-dev");
670+
//
671+
// // let fpcDirname = path.basename(fpcFilename, path.extname(fpcFilename));
672+
// // core.info(`Run Install fpc: ${lazarusPath}/${fpcDirname}`);
673+
// // await exec(`echo y | ./install.sh`, [], {cwd: `${lazarusPath}/${fpcDirname}`});
674+
// //
675+
// // core.info(`Run Install lazarus: ${lazarusPath}`);
676+
// // await exec(`make clean all`, [], {cwd: lazarusPath});
677+
// } catch (error) {
678+
// throw (error as Error);
679+
// }
683680
}
684681
// 删除要求用户输入的部分
685682
removeReadInput(path) {
@@ -1118,43 +1115,43 @@ exports.versions = {
11181115
"3.6": {
11191116
"fpcversion": "3.2.2",
11201117
"laz": "lazarus-3.6-0.tar.gz",
1121-
"fpc": "fpc-3.2.2.%s-linux.tar",
1118+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
11221119
"fpcsrc": "fpc-3.2.2.source.tar.gz"
11231120
},
11241121
"3.4": {
11251122
"fpcversion": "3.2.2",
11261123
"laz": "lazarus-3.4-0.tar.gz",
1127-
"fpc": "fpc-3.2.2.%s-linux.tar",
1124+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
11281125
"fpcsrc": "fpc-3.2.2.source.tar.gz"
11291126
},
11301127
"3.2": {
11311128
"fpcversion": "3.2.2",
11321129
"laz": "lazarus-3.2-0.tar.gz",
1133-
"fpc": "fpc-3.2.2.%s-linux.tar",
1130+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
11341131
"fpcsrc": "fpc-3.2.2.source.tar.gz"
11351132
},
11361133
"3.0": {
11371134
"fpcversion": "3.2.2",
11381135
"laz": "lazarus-3.0-0.tar.gz",
1139-
"fpc": "fpc-3.2.2.%s-linux.tar",
1136+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
11401137
"fpcsrc": "fpc-3.2.2.source.tar.gz"
11411138
},
11421139
"2.2.6": {
11431140
"fpcversion": "3.2.2",
11441141
"laz": "lazarus-2.2.6-0.tar.gz",
1145-
"fpc": "fpc-3.2.2.%s-linux.tar",
1142+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
11461143
"fpcsrc": "fpc-3.2.2.source.tar.gz"
11471144
},
11481145
"2.2.4": {
11491146
"fpcversion": "3.2.2",
11501147
"laz": "lazarus-2.2.4-0.tar.gz",
1151-
"fpc": "fpc-3.2.2.%s-linux.tar",
1148+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
11521149
"fpcsrc": "fpc-3.2.2.source.tar.gz"
11531150
},
11541151
"2.2.2": {
11551152
"fpcversion": "3.2.2",
11561153
"laz": "lazarus-2.2.2-0.tar.gz",
1157-
"fpc": "fpc-3.2.2.%s-linux.tar",
1154+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
11581155
"fpcsrc": "fpc-3.2.2.source.tar.gz"
11591156
}
11601157
},

‎src/lazarus.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export class Lazarus {
150150
// Perform a repository update
151151
await exec("sudo apt update");
152152
// linux arm64 和 linux x64 使用源码安装时
153-
if (this._Arch == 'arm64' || this._SourceInstall) {
153+
if (this._SourceInstall) {
154154
await this.sourceInstallLinux(cacheRestored)
155155
break
156156
}
@@ -382,12 +382,10 @@ export class Lazarus {
382382
// fpcName: fpc-3.2.2.%s-linux.tar
383383
// aarch64 | x86_64
384384
let tempArch = arch;
385-
if (tempArch == "x64") {
385+
if (arch == 'x64') {
386386
tempArch = "x86_64"
387-
} else if (tempArch == "arm64") {
388-
tempArch = "aarch64"
389387
}
390-
fpcName = fpcName.replace("%s", tempArch);
388+
fpcName = fpcName.replace("{arch}", tempArch);
391389
return fpcName
392390
}
393391
let source = versions['source']
@@ -484,6 +482,7 @@ export class Lazarus {
484482
// throw (error as Error);
485483
// }
486484
}
485+
487486
// 删除要求用户输入的部分
488487
private removeReadInput(path: string) {
489488
let data = fs.readFileSync(path, 'utf8');

‎src/version.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,43 +95,43 @@ export const versions = {
9595
"3.6": {
9696
"fpcversion": "3.2.2",
9797
"laz": "lazarus-3.6-0.tar.gz",
98-
"fpc": "fpc-3.2.2.%s-linux.tar",
98+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
9999
"fpcsrc": "fpc-3.2.2.source.tar.gz"
100100
},
101101
"3.4": {
102102
"fpcversion": "3.2.2",
103103
"laz": "lazarus-3.4-0.tar.gz",
104-
"fpc": "fpc-3.2.2.%s-linux.tar",
104+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
105105
"fpcsrc": "fpc-3.2.2.source.tar.gz"
106106
},
107107
"3.2": {
108108
"fpcversion": "3.2.2",
109109
"laz": "lazarus-3.2-0.tar.gz",
110-
"fpc": "fpc-3.2.2.%s-linux.tar",
110+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
111111
"fpcsrc": "fpc-3.2.2.source.tar.gz"
112112
},
113113
"3.0": {
114114
"fpcversion": "3.2.2",
115115
"laz": "lazarus-3.0-0.tar.gz",
116-
"fpc": "fpc-3.2.2.%s-linux.tar",
116+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
117117
"fpcsrc": "fpc-3.2.2.source.tar.gz"
118118
},
119119
"2.2.6": {
120120
"fpcversion": "3.2.2",
121121
"laz": "lazarus-2.2.6-0.tar.gz",
122-
"fpc": "fpc-3.2.2.%s-linux.tar",
122+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
123123
"fpcsrc": "fpc-3.2.2.source.tar.gz"
124124
},
125125
"2.2.4": {
126126
"fpcversion": "3.2.2",
127127
"laz": "lazarus-2.2.4-0.tar.gz",
128-
"fpc": "fpc-3.2.2.%s-linux.tar",
128+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
129129
"fpcsrc": "fpc-3.2.2.source.tar.gz"
130130
},
131131
"2.2.2": {
132132
"fpcversion": "3.2.2",
133133
"laz": "lazarus-2.2.2-0.tar.gz",
134-
"fpc": "fpc-3.2.2.%s-linux.tar",
134+
"fpc": "fpc-3.2.2.{arch}-linux.tar",
135135
"fpcsrc": "fpc-3.2.2.source.tar.gz"
136136
}
137137
},

0 commit comments

Comments
 (0)