Skip to content

Commit

Permalink
Merge branch 'hotfix/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
coord-e committed Apr 11, 2020
2 parents da503a3 + c52ed1e commit b8778ca
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
build_docker_images:
name: Build and push docker images
runs-on: ubuntu-latest
needs: release
steps:
- uses: actions/checkout@master
- run: docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} -p ${{ secrets.DOCKER_HUB_PASSWORD }}
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to this project will be documented in this file.

## [1.0.1] - 2020-04-11

- Fixed a problem on CI.

## [1.0.0] - 2020-04-11

- Added detailed explanation of usage to README.
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "magicpak"
version = "1.0.0"
version = "1.0.1"
authors = ["coord.e <me@coord-e.com>"]
edition = "2018"
license = "MIT OR Apache-2.0"
Expand Down
10 changes: 5 additions & 5 deletions dockerfile/images.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"args": {
"BUSYBOX_VERSION": "1.31.0-defconfig-multiarch-musl",
"UPX_VERSION": "3.96",
"MAGICPAK_VERSION": "1.0.0",
"MAGICPAK_VERSION": "1.0.1",
"DEBIAN_PACKAGES": ""
}
},
Expand All @@ -17,7 +17,7 @@
"args": {
"BUSYBOX_VERSION": "1.31.0-defconfig-multiarch-musl",
"UPX_VERSION": "3.96",
"MAGICPAK_VERSION": "1.0.0",
"MAGICPAK_VERSION": "1.0.1",
"DEBIAN_PACKAGES": ""
}
},
Expand All @@ -28,7 +28,7 @@
"args": {
"BUSYBOX_VERSION": "1.31.0-defconfig-multiarch-musl",
"UPX_VERSION": "3.96",
"MAGICPAK_VERSION": "1.0.0",
"MAGICPAK_VERSION": "1.0.1",
"DEBIAN_PACKAGES": ""
}
},
Expand All @@ -39,7 +39,7 @@
"args": {
"BUSYBOX_VERSION": "1.31.0-defconfig-multiarch-musl",
"UPX_VERSION": "3.96",
"MAGICPAK_VERSION": "1.0.0",
"MAGICPAK_VERSION": "1.0.1",
"DEBIAN_PACKAGES": "build-essential clang"
}
},
Expand All @@ -50,7 +50,7 @@
"args": {
"BUSYBOX_VERSION": "1.31.0-defconfig-multiarch-musl",
"UPX_VERSION": "3.96",
"MAGICPAK_VERSION": "1.0.0",
"MAGICPAK_VERSION": "1.0.1",
"DEBIAN_PACKAGES": ""
}
}
Expand Down

0 comments on commit b8778ca

Please sign in to comment.