Skip to content

Commit ac31c01

Browse files
RyanGlScottRyanGlScott
committed
GHA backend: simplify ARG_COMPILER's definition slightly
Previously, `ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc` would be generated. However, `HC=/opt/ghc/$GHC_VERSION/bin/ghc` is defined immediately before that line, so we can simplify this to just `ARG_COMPILER=--ghc --with-compiler=$HC`. Indeed, the `bash` backend already does this—see https://github.com/haskell-CI/haskell-ci/blob/4fd29ae752644c886c29fd509507a2a82b9d69f5/src/HaskellCI/Bash/Template.hs#L477.
1 parent cf2bb5f commit ac31c01

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
9393
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
9494
if [ $((HCNUMVER > 90001)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> $GITHUB_ENV ; else echo "HEADHACKAGE=false" >> $GITHUB_ENV ; fi
95-
echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
95+
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
9696
echo "GHCJSARITH=0" >> $GITHUB_ENV
9797
env:
9898
GHC_VERSION: ${{ matrix.ghc }}

‎fixtures/all-versions.github‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
134134
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
135135
echo "HEADHACKAGE=false" >> $GITHUB_ENV
136-
echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
136+
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
137137
echo "GHCJSARITH=0" >> $GITHUB_ENV
138138
env:
139139
GHC_VERSION: ${{ matrix.ghc }}

‎fixtures/copy-fields-all.github‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
110110
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
111111
echo "HEADHACKAGE=false" >> $GITHUB_ENV
112-
echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
112+
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
113113
echo "GHCJSARITH=0" >> $GITHUB_ENV
114114
env:
115115
GHC_VERSION: ${{ matrix.ghc }}

‎fixtures/copy-fields-none.github‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
110110
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
111111
echo "HEADHACKAGE=false" >> $GITHUB_ENV
112-
echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
112+
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
113113
echo "GHCJSARITH=0" >> $GITHUB_ENV
114114
env:
115115
GHC_VERSION: ${{ matrix.ghc }}

‎fixtures/copy-fields-some.github‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
110110
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
111111
echo "HEADHACKAGE=false" >> $GITHUB_ENV
112-
echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
112+
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
113113
echo "GHCJSARITH=0" >> $GITHUB_ENV
114114
env:
115115
GHC_VERSION: ${{ matrix.ghc }}

‎fixtures/empty-line.github‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
110110
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
111111
if [ $((HCNUMVER > 81004)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> $GITHUB_ENV ; else echo "HEADHACKAGE=false" >> $GITHUB_ENV ; fi
112-
echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
112+
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
113113
echo "GHCJSARITH=0" >> $GITHUB_ENV
114114
env:
115115
GHC_VERSION: ${{ matrix.ghc }}

‎fixtures/irc-channels.github‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
135135
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
136136
echo "HEADHACKAGE=false" >> $GITHUB_ENV
137-
echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
137+
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
138138
echo "GHCJSARITH=0" >> $GITHUB_ENV
139139
env:
140140
GHC_VERSION: ${{ matrix.ghc }}

‎fixtures/messy.github‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
110110
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
111111
if [ $((HCNUMVER > 81004)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> $GITHUB_ENV ; else echo "HEADHACKAGE=false" >> $GITHUB_ENV ; fi
112-
echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
112+
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
113113
echo "GHCJSARITH=0" >> $GITHUB_ENV
114114
env:
115115
GHC_VERSION: ${{ matrix.ghc }}

‎fixtures/psql.github‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
116116
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
117117
echo "HEADHACKAGE=false" >> $GITHUB_ENV
118-
echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
118+
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
119119
echo "GHCJSARITH=0" >> $GITHUB_ENV
120120
env:
121121
GHC_VERSION: ${{ matrix.ghc }}

‎fixtures/travis-patch.github‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
110110
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
111111
echo "HEADHACKAGE=false" >> $GITHUB_ENV
112-
echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
112+
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
113113
echo "GHCJSARITH=0" >> $GITHUB_ENV
114114
env:
115115
GHC_VERSION: ${{ matrix.ghc }}

0 commit comments

Comments
 (0)