Compare commits

..

No commits in common. "6e47874c1f2dbd8aaa343a0096a8240c3632f742" and "40c3f65650afc80ab881b47007d4c14c9c29e1c5" have entirely different histories.

View file

@ -8,7 +8,6 @@ on:
env: env:
DOCKER_TLS_CERTDIR: /certs DOCKER_TLS_CERTDIR: /certs
IMAGE_TAG: ${{ github.sha }} IMAGE_TAG: ${{ github.sha }}
SHORT_SHA: ${{ github.sha }}
jobs: jobs:
splatoon: splatoon:
@ -32,13 +31,10 @@ jobs:
- name: Login to registry - name: Login to registry
run: docker login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net run: docker login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net
- name: Set short SHA
run: echo "SHORT_SHA=${GITHUB_SHA::6}" >> $GITHUB_ENV
- name: Build Splatoon edition - name: Build Splatoon edition
env: env:
CI_REGISTRY_IMAGE: git.spbr.net/spacebar/rust-nex CI_REGISTRY_IMAGE: git.spbr.net/spacebar/rust-nex
CI_COMMIT_SHORT_SHA: ${{ env.SHORT_SHA }} CI_COMMIT_SHORT_SHA: ${{ github.sha }}
run: ./.ci-scripts/make-edition.sh splatoon run: ./.ci-scripts/make-edition.sh splatoon
friends: friends:
@ -59,14 +55,11 @@ jobs:
~/.local/share/containers/storage ~/.local/share/containers/storage
key: image-cache key: image-cache
- name: Set short SHA
run: echo "SHORT_SHA=${GITHUB_SHA::6}" >> $GITHUB_ENV
- name: Login to registry - name: Login to registry
run: podman login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net run: podman login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net
- name: Build Friends edition - name: Build Friends edition
env: env:
CI_REGISTRY_IMAGE: git.spbr.net/spacebar/rust-nex CI_REGISTRY_IMAGE: git.spbr.net/spacebar/rust-nex
CI_COMMIT_SHORT_SHA: ${{ env.SHORT_SHA }} CI_COMMIT_SHORT_SHA: ${{ github.sha }}
run: ./.ci-scripts/make-edition.sh friends run: ./.ci-scripts/make-edition.sh friends