File tree Expand file tree Collapse file tree 3 files changed +9
-6
lines changed Expand file tree Collapse file tree 3 files changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -31,8 +31,9 @@ ARG pandoc_commit=main
31
31
RUN git clone --branch=$pandoc_commit --depth=1 --quiet \
32
32
https://github.com/jgm/pandoc /usr/src/pandoc
33
33
34
- # Remove the settings that ship with pandoc.
35
- RUN rm -f cabal.project
34
+ # Remove the settings that ship with pandoc, unless we're building the main
35
+ # branch.
36
+ RUN [ "${pandoc_commit}" = "main" ] || rm -f cabal.project
36
37
37
38
COPY ./alpine/freeze/pandoc-$pandoc_commit.project.freeze \
38
39
/usr/src/pandoc/cabal.project.freeze
Original file line number Diff line number Diff line change @@ -24,8 +24,9 @@ ARG pandoc_commit=main
24
24
RUN git clone --branch=$pandoc_commit --depth=1 --quiet \
25
25
https://github.com/jgm/pandoc /usr/src/pandoc
26
26
27
- # Remove the settings that ship with pandoc.
28
- RUN rm -f cabal.project
27
+ # Remove the settings that ship with pandoc, unless we're building the main
28
+ # branch.
29
+ RUN [ "${pandoc_commit}" = "main" ] || rm -f cabal.project
29
30
30
31
COPY ./static/freeze/pandoc-$pandoc_commit.project.freeze \
31
32
/usr/src/pandoc/cabal.project.freeze
Original file line number Diff line number Diff line change @@ -35,8 +35,9 @@ ARG pandoc_commit=main
35
35
RUN git clone --branch=$pandoc_commit --depth=1 --quiet \
36
36
https://github.com/jgm/pandoc /usr/src/pandoc
37
37
38
- # Remove the settings that ship with pandoc.
39
- RUN rm -f cabal.project
38
+ # Remove the settings that ship with pandoc, unless we're building the main
39
+ # branch.
40
+ RUN [ "${pandoc_commit}" = "main" ] || rm -f cabal.project
40
41
41
42
COPY ./ubuntu/freeze/pandoc-$pandoc_commit.project.freeze \
42
43
/usr/src/pandoc/cabal.project.freeze
You can’t perform that action at this time.
0 commit comments