Skip to content

Commit 2658829

Browse files
bdovazbdovaz
committed
Run build.sh --doc
1 parent d69d9c8 commit 2658829

File tree

198 files changed

+2323
-1521
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+2323
-1521
lines changed

‎.automation/generated/flavors-stats.json‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,6 +1479,10 @@
14791479
[
14801480
"2023-05-13T20:23:06",
14811481
2948676
1482+
],
1483+
[
1484+
"2023-05-14T16:41:46",
1485+
2949395
14821486
]
14831487
],
14841488
"ci_light": [
@@ -2961,6 +2965,10 @@
29612965
[
29622966
"2023-05-13T20:23:06",
29632967
63857
2968+
],
2969+
[
2970+
"2023-05-14T16:41:46",
2971+
63926
29642972
]
29652973
],
29662974
"cupcake": [
@@ -3423,6 +3431,10 @@
34233431
[
34243432
"2023-05-13T20:23:06",
34253433
10508
3434+
],
3435+
[
3436+
"2023-05-14T16:41:46",
3437+
10516
34263438
]
34273439
],
34283440
"dart": [
@@ -5815,6 +5827,10 @@
58155827
[
58165828
"2023-05-13T20:23:06",
58175829
147866
5830+
],
5831+
[
5832+
"2023-05-14T16:41:46",
5833+
147912
58185834
]
58195835
],
58205836
"dotnet": [
@@ -7297,6 +7313,10 @@
72977313
[
72987314
"2023-05-13T20:23:06",
72997315
383804
7316+
],
7317+
[
7318+
"2023-05-14T16:41:46",
7319+
383850
73007320
]
73017321
],
73027322
"go": [
@@ -8779,6 +8799,10 @@
87798799
[
87808800
"2023-05-13T20:23:06",
87818801
20443
8802+
],
8803+
[
8804+
"2023-05-14T16:41:46",
8805+
20453
87828806
]
87838807
],
87848808
"java": [
@@ -10261,6 +10285,10 @@
1026110285
[
1026210286
"2023-05-13T20:23:06",
1026310287
118907
10288+
],
10289+
[
10290+
"2023-05-14T16:41:46",
10291+
118947
1026410292
]
1026510293
],
1026610294
"javascript": [
@@ -11743,6 +11771,10 @@
1174311771
[
1174411772
"2023-05-13T20:23:06",
1174511773
260231
11774+
],
11775+
[
11776+
"2023-05-14T16:41:46",
11777+
260540
1174611778
]
1174711779
],
1174811780
"php": [
@@ -13225,6 +13257,10 @@
1322513257
[
1322613258
"2023-05-13T20:23:06",
1322713259
49374
13260+
],
13261+
[
13262+
"2023-05-14T16:41:46",
13263+
49381
1322813264
]
1322913265
],
1323013266
"python": [
@@ -14707,6 +14743,10 @@
1470714743
[
1470814744
"2023-05-13T20:23:06",
1470914745
203948
14746+
],
14747+
[
14748+
"2023-05-14T16:41:46",
14749+
204160
1471014750
]
1471114751
],
1471214752
"ruby": [
@@ -16185,6 +16225,10 @@
1618516225
[
1618616226
"2023-05-13T20:23:06",
1618716227
3557
16228+
],
16229+
[
16230+
"2023-05-14T16:41:46",
16231+
3565
1618816232
]
1618916233
],
1619016234
"rust": [
@@ -17663,6 +17707,10 @@
1766317707
[
1766417708
"2023-05-13T20:23:06",
1766517709
5578
17710+
],
17711+
[
17712+
"2023-05-14T16:41:46",
17713+
5586
1766617714
]
1766717715
],
1766817716
"salesforce": [
@@ -19145,6 +19193,10 @@
1914519193
[
1914619194
"2023-05-13T20:23:06",
1914719195
19321
19196+
],
19197+
[
19198+
"2023-05-14T16:41:46",
19199+
19339
1914819200
]
1914919201
],
1915019202
"scala": [
@@ -20625,6 +20677,10 @@
2062520677
[
2062620678
"2023-05-13T20:23:06",
2062720679
9125
20680+
],
20681+
[
20682+
"2023-05-14T16:41:46",
20683+
9131
2062820684
]
2062920685
],
2063020686
"swift": [
@@ -22103,6 +22159,10 @@
2210322159
[
2210422160
"2023-05-13T20:23:06",
2210522161
3698
22162+
],
22163+
[
22164+
"2023-05-14T16:41:46",
22165+
3704
2210622166
]
2210722167
],
2210822168
"terraform": [
@@ -23585,6 +23645,10 @@
2358523645
[
2358623646
"2023-05-13T20:23:06",
2358723647
235593
23648+
],
23649+
[
23650+
"2023-05-14T16:41:46",
23651+
235771
2358823652
]
2358923653
]
2359023654
}

‎Dockerfile‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,13 @@ RUN apk add --update --no-cache libc6-compat \
6666
## @generated by .automation/build.py using descriptor files, please do not update manually ##
6767
#############################################################################################
6868
#ARG__START
69+
ARG TARGETPLATFORM
6970
ARG PWSH_VERSION='latest'
7071
ARG PWSH_DIRECTORY='/opt/microsoft/powershell'
7172
ARG ARM_TTK_NAME='master.zip'
7273
ARG ARM_TTK_URI='https://github.com/Azure/arm-ttk/archive/master.zip'
7374
ARG ARM_TTK_DIRECTORY='/opt/microsoft'
74-
ARG TARGETPLATFORM
7575
ARG BICEP_EXE='bicep'
76-
ARG BICEP_URI='https://github.com/Azure/bicep/releases/latest/download/bicep-linux-musl-x64'
7776
ARG BICEP_DIR='/usr/local/bin'
7877
ARG DART_VERSION='2.8.4'
7978
ARG PMD_VERSION=6.55.0
@@ -351,13 +350,17 @@ COPY --from=kics /app/bin/assets /opt/kics/assets/
351350
#OTHER__START
352351
RUN rc-update add docker boot && rc-service docker start || true
353352
# ARM installation
354-
RUN --mount=type=secret,id=GITHUB_TOKEN mkdir -p ${PWSH_DIRECTORY} \
353+
RUN --mount=type=secret,id=GITHUB_TOKEN case ${TARGETPLATFORM} in \
354+
"linux/amd64") POWERSHELL_ARCH=alpine-x64 ;; \
355+
"linux/arm64") POWERSHELL_ARCH=arm64 ;; \
356+
esac \
357+
&& mkdir -p ${PWSH_DIRECTORY} \
355358
&& curl --retry 5 --retry-delay 5 -s \
356359
-H "Accept: application/vnd.github+json" \
357360
-H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \
358361
https://api.github.com/repos/powershell/powershell/releases/${PWSH_VERSION} \
359362
| grep browser_download_url \
360-
| grep linux-alpine-x64 \
363+
| grep linux-${POWERSHELL_ARCH} \
361364
| cut -d '"' -f 4 \
362365
| xargs -n 1 wget -O - \
363366
| tar -xzC ${PWSH_DIRECTORY} \
@@ -480,13 +483,17 @@ RUN --mount=type=secret,id=GITHUB_TOKEN GITHUB_AUTH_TOKEN="$(cat /run/secrets/GI
480483
ENV PATH="/root/.composer/vendor/bin:$PATH"
481484

482485
# POWERSHELL installation
483-
RUN --mount=type=secret,id=GITHUB_TOKEN mkdir -p ${PWSH_DIRECTORY} \
486+
RUN --mount=type=secret,id=GITHUB_TOKEN case ${TARGETPLATFORM} in \
487+
"linux/amd64") POWERSHELL_ARCH=alpine-x64 ;; \
488+
"linux/arm64") POWERSHELL_ARCH=arm64 ;; \
489+
esac \
490+
&& mkdir -p ${PWSH_DIRECTORY} \
484491
&& curl --retry 5 --retry-delay 5 -s \
485492
-H "Accept: application/vnd.github+json" \
486493
-H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \
487494
https://api.github.com/repos/powershell/powershell/releases/${PWSH_VERSION} \
488495
| grep browser_download_url \
489-
| grep linux-alpine-x64 \
496+
| grep linux-${POWERSHELL_ARCH} \
490497
| cut -d '"' -f 4 \
491498
| xargs -n 1 wget -O - \
492499
| tar -xzC ${PWSH_DIRECTORY} \
@@ -541,9 +548,13 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
541548
# Managed with COPY --link --from=shfmt /bin/shfmt /usr/bin/
542549

543550
# bicep_linter installation
544-
&& curl --retry 5 --retry-delay 5 -sLo ${BICEP_EXE} "${BICEP_URI}" \
545-
&& chmod +x "${BICEP_EXE}" \
546-
&& mv "${BICEP_EXE}" "${BICEP_DIR}" \
551+
&& case ${TARGETPLATFORM} in \
552+
"linux/amd64") POWERSHELL_ARCH=musl-x64 ;; \
553+
"linux/arm64") POWERSHELL_ARCH=arm64 ;; \
554+
esac \
555+
&& curl --retry 5 --retry-delay 5 -sLo ${BICEP_EXE} "https://github.com/Azure/bicep/releases/latest/download/bicep-linux-${POWERSHELL_ARCH}" \
556+
&& chmod +x "${BICEP_EXE}" \
557+
&& mv "${BICEP_EXE}" "${BICEP_DIR}" \
547558

548559
# clj-kondo installation
549560
&& curl --retry 5 --retry-delay 5 -sLO https://raw.githubusercontent.com/clj-kondo/clj-kondo/master/script/install-clj-kondo \
@@ -559,7 +570,11 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
559570
&& /usr/share/dotnet/dotnet tool install -g csharpier \
560571

561572
# dartanalyzer installation
562-
&& wget --tries=5 https://storage.googleapis.com/dart-archive/channels/stable/release/${DART_VERSION}/sdk/dartsdk-linux-x64-release.zip -O - -q | unzip -q - \
573+
&& case ${TARGETPLATFORM} in \
574+
"linux/amd64") DART_ARCH=x64 ;; \
575+
"linux/arm64") DART_ARCH=arm64 ;; \
576+
esac \
577+
&& wget --tries=5 https://storage.googleapis.com/dart-archive/channels/stable/release/${DART_VERSION}/sdk/dartsdk-linux-${DART_ARCH}-release.zip -O - -q | unzip -q - \
563578
&& chmod +x dart-sdk/bin/dart* \
564579
&& mv dart-sdk/bin/* /usr/bin/ && mv dart-sdk/lib/* /usr/lib/ && mv dart-sdk/include/* /usr/include/ \
565580
&& rm -r dart-sdk/ \

0 commit comments

Comments
 (0)