2021 12 03 installer rename (#3876)

* Rename installers to try and make it more obvious waht they are

* Try super short names

* Fix missing update to error message on CRUDAction.update()

* Remove special branch

* Update submodule
This commit is contained in:
Chris Stewart 2021-12-04 06:10:08 -06:00 committed by GitHub
parent 2d5732375f
commit 6e7af37ca0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions

View file

@ -108,13 +108,13 @@ jobs:
- name: Upload dmg
uses: actions/upload-artifact@v1
with:
name: "bitcoin-s-dmg-${{steps.previoustag.outputs.tag}}-${{github.sha}}"
name: "mac"
path: ${{ env.pkg-name }}-${{steps.previoustag.outputs.tag}}.dmg
- name: Upload if release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
name: "bitcoin-s-dmg-${{steps.previoustag.outputs.tag}}-${{github.sha}}"
name: "mac"
files: ${{ env.pkg-name }}-${{steps.previoustag.outputs.tag}}.dmg
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@ -148,13 +148,13 @@ jobs:
env:
pkg-version: ${{steps.previoustag.outputs.tag}}
with:
name: "bitcoin-s-deb-${{steps.previoustag.outputs.tag}}-${{github.sha}}"
name: "deb"
path: "${{ env.pkg-name }}_${{ steps.previoustag.outputs.tag }}-1_amd64.deb"
- name: Upload if release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
name: "bitcoin-s-deb-${{steps.previoustag.outputs.tag}}-${{github.sha}}"
name: "deb"
files: "${{ env.pkg-name }}_${{ steps.previoustag.outputs.tag }}-1_amd64.deb"
env:
pkg-version: ${{steps.previoustag.outputs.tag}}
@ -184,13 +184,13 @@ jobs:
- name: Upload installer
uses: actions/upload-artifact@v1
with:
name: bitcoin-s-msi-${{steps.previoustag.outputs.tag}}-${{github.sha}}
name: windows
path: "D:\\a\\bitcoin-s\\bitcoin-s\\app\\bundle\\target\\windows\\bitcoin-s-bundle.msi"
- name: Upload if release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
name: bitcoin-s-msi-${{steps.previoustag.outputs.tag}}-${{github.sha}}
name: windows
files: "D:\\a\\bitcoin-s\\bitcoin-s\\app\\bundle\\target\\windows\\bitcoin-s-bundle.msi"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View file

@ -20,7 +20,12 @@ abstract class CRUDAction[T, PrimaryKeyType](implicit
}
def updateAction(t: T): DBIOAction[T, NoStream, Effect.Write] = {
updateAllAction(Vector(t)).map(_.head)
updateAllAction(Vector(t)).map { ts =>
ts.headOption match {
case Some(updated) => updated
case None => throw UpdateFailedException("Update failed for: " + t)
}
}
}
protected def find(t: T): Query[Table[_], T, Seq] = findAll(Vector(t))