Skip to content

Commit 8b66f63

Browse files
committed
Modify: shell prologue, sha pins
1 parent 9467561 commit 8b66f63

File tree

5 files changed

+45
-15
lines changed

5 files changed

+45
-15
lines changed

.github/workflows/ci-comprehensive-build-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181

8282
- name: Cache Dependencies (Linux)
8383
if: runner.os == 'Linux'
84-
uses: actions/cache@v4
84+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
8585
with:
8686
path: |
8787
/var/cache/apt/archives
@@ -93,7 +93,7 @@ jobs:
9393
9494
- name: Cache Dependencies (macOS)
9595
if: runner.os == 'macOS'
96-
uses: actions/cache@v4
96+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
9797
with:
9898
path: |
9999
~/Library/Caches/Homebrew
@@ -348,7 +348,7 @@ jobs:
348348
persist-credentials: false
349349

350350
- name: Cache Dependencies
351-
uses: actions/cache@v4
351+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
352352
with:
353353
path: |
354354
/var/cache/apt/archives
@@ -658,7 +658,7 @@ jobs:
658658
git config --global credential.helper ""
659659
660660
- name: Setup MSBuild
661-
uses: microsoft/setup-msbuild@v2
661+
uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2
662662

663663
- name: Clone iccDEV
664664
run: |

.github/workflows/ci-docker-latest.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ jobs:
4141
name: "Build iccDEV Docker"
4242
runs-on: ubuntu-latest
4343
timeout-minutes: 30
44+
defaults:
45+
run:
46+
shell: bash --noprofile --norc {0}
4447

4548
steps:
4649
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -118,9 +121,13 @@ jobs:
118121
run: docker build -f Dockerfile -t iccdev-test:latest .
119122

120123
- name: Verify tools
121-
shell: bash
124+
env:
125+
BASH_ENV: /dev/null
122126
run: |
123127
set -euo pipefail
128+
git config --add safe.directory "$PWD"
129+
git config --global credential.helper ""
130+
unset GITHUB_TOKEN || true
124131
TOOL_COUNT=$(docker run --rm iccdev-test:latest bash -c \
125132
'find /opt/iccdev/Build/Tools -type f -executable | wc -l')
126133
echo "Tools built: $TOOL_COUNT"
@@ -145,9 +152,13 @@ jobs:
145152
>> "$GITHUB_STEP_SUMMARY"
146153
echo '```' >> "$GITHUB_STEP_SUMMARY"
147154
- name: Test tool execution
148-
shell: bash
155+
env:
156+
BASH_ENV: /dev/null
149157
run: |
150158
set -euo pipefail
159+
git config --add safe.directory "$PWD"
160+
git config --global credential.helper ""
161+
unset GITHUB_TOKEN || true
151162
FAILURES=0
152163
echo "### Tool Tests" >> "$GITHUB_STEP_SUMMARY"
153164
for tool in iccToXml iccFromXml iccDumpProfile iccRoundTrip; do
@@ -165,9 +176,13 @@ jobs:
165176
exit 1
166177
fi
167178
- name: Test iccToXml profile conversion
168-
shell: bash
179+
env:
180+
BASH_ENV: /dev/null
169181
run: |
170182
set -euo pipefail
183+
git config --add safe.directory "$PWD"
184+
git config --global credential.helper ""
185+
unset GITHUB_TOKEN || true
171186
echo "### iccToXml Profile Conversion" >> "$GITHUB_STEP_SUMMARY"
172187
docker run --rm iccdev-test:latest bash -c '
173188
set -euo pipefail

.github/workflows/ci-docker-nixos.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ jobs:
3737
name: "Build iccDEV NixOS Docker"
3838
runs-on: ubuntu-latest
3939
timeout-minutes: 45
40+
defaults:
41+
run:
42+
shell: bash --noprofile --norc {0}
4043

4144
steps:
4245
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -115,9 +118,13 @@ jobs:
115118
run: docker build -f Dockerfile.nixos -t iccdev-nixos-test:latest .
116119

117120
- name: Verify tools
118-
shell: bash
121+
env:
122+
BASH_ENV: /dev/null
119123
run: |
120124
set -euo pipefail
125+
git config --add safe.directory "$PWD"
126+
git config --global credential.helper ""
127+
unset GITHUB_TOKEN || true
121128
TOOL_COUNT=$(docker run --rm iccdev-nixos-test:latest sh -c \
122129
'find /workspace/iccDEV/Build/Tools -type f -executable | wc -l')
123130
echo "Tools built: $TOOL_COUNT"
@@ -134,9 +141,13 @@ jobs:
134141
echo '```' >> "$GITHUB_STEP_SUMMARY"
135142
136143
- name: Test tool execution
137-
shell: bash
144+
env:
145+
BASH_ENV: /dev/null
138146
run: |
139147
set -euo pipefail
148+
git config --add safe.directory "$PWD"
149+
git config --global credential.helper ""
150+
unset GITHUB_TOKEN || true
140151
FAILURES=0
141152
echo "### Tool Tests" >> "$GITHUB_STEP_SUMMARY"
142153
for tool in iccToXml iccFromXml iccDumpProfile iccRoundTrip; do
@@ -155,9 +166,13 @@ jobs:
155166
fi
156167
157168
- name: Test iccToXml profile conversion
158-
shell: bash
169+
env:
170+
BASH_ENV: /dev/null
159171
run: |
160172
set -euo pipefail
173+
git config --add safe.directory "$PWD"
174+
git config --global credential.helper ""
175+
unset GITHUB_TOKEN || true
161176
echo "### iccToXml Profile Conversion" >> "$GITHUB_STEP_SUMMARY"
162177
docker run --rm iccdev-nixos-test:latest sh -c '
163178
set -euo pipefail

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN groupadd -r iccdev \
5252
&& useradd -r -g iccdev -d /opt/iccdev -s /bin/bash iccdev \
5353
&& chown -R iccdev:iccdev /opt/iccdev
5454

55-
ENV PATH="/opt/iccdev/Build/Tools/IccToXml:/opt/iccdev/Build/Tools/IccFromXml:/opt/iccdev/Build/Tools/IccDumpProfile:/opt/iccdev/Build/Tools/IccApplyNamedCmm:/opt/iccdev/Build/Tools/IccRoundTrip:/opt/iccdev/Build/Tools/IccFromCube:/opt/iccdev/Build/Tools/IccApplyProfiles:/opt/iccdev/Build/Tools/IccApplySearch:/opt/iccdev/Build/Tools/IccApplyToLink:/opt/iccdev/Build/Tools/IccPngDump:/opt/iccdev/Build/Tools/IccSpecSepToTiff:/opt/iccdev/Build/Tools/IccTiffDump:/opt/iccdev/Build/Tools/IccV5DspObsToV4Dsp:${PATH}"
55+
ENV PATH="/opt/iccdev/Build/Tools/IccToXml:/opt/iccdev/Build/Tools/IccFromXml:/opt/iccdev/Build/Tools/IccDumpProfile:/opt/iccdev/Build/Tools/IccApplyNamedCmm:/opt/iccdev/Build/Tools/IccRoundTrip:/opt/iccdev/Build/Tools/IccFromCube:/opt/iccdev/Build/Tools/IccApplyProfiles:/opt/iccdev/Build/Tools/IccApplySearch:/opt/iccdev/Build/Tools/IccApplyToLink:/opt/iccdev/Build/Tools/IccJpegDump:/opt/iccdev/Build/Tools/IccPngDump:/opt/iccdev/Build/Tools/IccSpecSepToTiff:/opt/iccdev/Build/Tools/IccTiffDump:/opt/iccdev/Build/Tools/IccV5DspObsToV4Dsp:${PATH}"
5656

5757
USER iccdev
5858
WORKDIR /opt/iccdev

Dockerfile.nixos

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
###############################################################
2121

2222
# Use official NixOS Docker image
23-
FROM nixos/nix:latest
23+
FROM nixos/nix:2.33.2@sha256:c6ebd12d96b3374ee15e3986c15aa43f5e49310634f17afcaaf4dafe4f6732b2
2424

2525
LABEL org.opencontainers.image.title="iccDEV Build Container (NixOS)" \
2626
org.opencontainers.image.description="iccDEV built with Nix package manager" \
@@ -42,7 +42,7 @@ RUN nix-shell -p git cmake gcc gnumake pkg-config libxml2 libtiff libjpeg libpng
4242
echo "=== Building iccDEV from HEAD ===" && \
4343
git log -1 --oneline && \
4444
cd Build && \
45-
cmake Cmake && \
45+
cmake -DCMAKE_BUILD_TYPE=Release Cmake && \
4646
make -j$(nproc) && \
4747
echo "=== Build Complete ===" && \
4848
echo "Built tools:" && \
@@ -101,8 +101,8 @@ echo ""
101101
echo "iccDEV Libraries (in /workspace/iccDEV/Build):"
102102
echo ""
103103
echo "Shared Libraries (.so):"
104-
echo " - IccProfLib/libIccProfLib2.so.2.3.1.4"
105-
echo " - IccXML/libIccXML2.so.2.3.1.4"
104+
echo " - IccProfLib/libIccProfLib2.so -> libIccProfLib2.so.<version>"
105+
echo " - IccXML/libIccXML2.so -> libIccXML2.so.<version>"
106106
echo ""
107107
echo "Static Libraries (.a):"
108108
echo " - IccProfLib/libIccProfLib2-static.a"

0 commit comments

Comments
 (0)