e402011 · bat · git.iko.soy

git.iko.soy/bat

on master help sign in

CICD: Build: Split out dir creation into the individual package steps

e402011Martin Nordholts6 years ago

.github/workflows/CICD.yml+4−7

compare with master

unifiedsplit

@@ -156,13 +156,6 @@ jobs:

156 # * executable for `strip`?

157 STRIP="strip" ; case ${{ matrix.job.target }} in arm-unknown-linux-gnueabihf) STRIP="arm-linux-gnueabihf-strip" ;; aarch64-unknown-linux-gnu) STRIP="aarch64-linux-gnu-strip" ;; *-pc-windows-msvc) STRIP="" ;; esac;

158 echo ::set-output name=STRIP::${STRIP}

159− - name: Create all needed build/work directories

160− shell: bash

161− run: |

162− mkdir -p '${{ steps.vars.outputs.STAGING }}'

163− mkdir -p '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}'

164− mkdir -p '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/autocomplete'

165− mkdir -p '${{ steps.vars.outputs.STAGING }}/dpkg'

166 - name: Install Rust toolchain

159 - name: Install Rust toolchain

167 uses: actions-rs/toolchain@v1

160 uses: actions-rs/toolchain@v1

168 with:

161 with:

@@ -231,6 +224,9 @@ jobs:

231 shell: bash

224 shell: bash

232 run: |

225 run: |

233 ARCHIVE_DIR='${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'

226 ARCHIVE_DIR='${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'

227+ mkdir -p "${ARCHIVE_DIR}"

228+ mkdir -p "${ARCHIVE_DIR}/autocomplete"

229+

234 # Binary

230 # Binary

235 cp 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' "$ARCHIVE_DIR"

231 cp 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' "$ARCHIVE_DIR"

236

232

@@ -260,6 +256,7 @@ jobs:

260 run: |

256 run: |

261 COPYRIGHT_YEARS="2018 - "$(date "+%Y")

257 COPYRIGHT_YEARS="2018 - "$(date "+%Y")

262 DPKG_DIR="${{ steps.vars.outputs.STAGING }}/dpkg"

258 DPKG_DIR="${{ steps.vars.outputs.STAGING }}/dpkg"

259+ mkdir -p "${DPKG_DIR}"

263

260

264 # Binary

261 # Binary

265 install -Dm755 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' "${DPKG_DIR}/usr/bin/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}"

262 install -Dm755 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' "${DPKG_DIR}/usr/bin/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}"