Ma/mscp
1
0
Fork 0
mirror of https://github.com/upa/mscp.git synced 2026-02-28 03:24:41 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

remove VERSION from package file names

Browse Source 
This change enables downloading latest packages from URL
https://github.com/upa/mscp/releases/latest/download/PACKAGE
This commit is contained in:
Ryo Nakamura
2023-03-12 23:01:06 +09:00
parent e2da5811ce
commit 6e17d0ddbc
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/release.yml vendored
View File

@@ -24,11 +24,6 @@ jobs:
- name: install build dependency - name: install build dependency
run: sudo ./scripts/install-build-deps.sh run: sudo ./scripts/install-build-deps.sh
- name: Set variables
run: |
VER=$(cat VERSION)
echo "VERSION=$VER" >> $GITHUB_ENV
- name: Configure Cmake - name: Configure Cmake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
@@ -41,15 +36,19 @@ jobs:
- name: Retrieve packages from containers - name: Retrieve packages from containers
run: make -C ${{github.workspace}}/build docker-pkg-all run: make -C ${{github.workspace}}/build docker-pkg-all
- name: Copy mscp single binary built inside Alpine
run: cp ${{github.workspace}}/build/mscp_alpine-3.17-x86_64.static ${{github.workspace}}/build/mscp.linux.x86.static
- name: Release - name: Release
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
with: with:
files: | files: |
${{github.workspace}}/build/mscp_${{env.VERSION}}-ubuntu-20.04-x86_64.deb ${{github.workspace}}/build/mscp_ubuntu-20.04-x86_64.deb
${{github.workspace}}/build/mscp_${{env.VERSION}}-ubuntu-22.04-x86_64.deb ${{github.workspace}}/build/mscp_ubuntu-22.04-x86_64.deb
${{github.workspace}}/build/mscp_${{env.VERSION}}-centos-8-x86_64.rpm ${{github.workspace}}/build/mscp_centos-8-x86_64.rpm
${{github.workspace}}/build/mscp_${{env.VERSION}}-rocky-8.6-x86_64.rpm ${{github.workspace}}/build/mscp_rocky-8.6-x86_64.rpm
${{github.workspace}}/build/mscp_${{env.VERSION}}-apline-3.17-x86_64.static ${{github.workspace}}/build/mscp_alpine-3.17-x86_64.static
${{github.workspace}}/build/mscp.linux.x86.static
source-release: source-release:
runs-on: ubuntu-latest runs-on: ubuntu-latest

4
CMakeLists.txt
View File

@@ -143,7 +143,7 @@ if(UNIX AND NOT APPLE) # on linux
OUTPUT_VARIABLE DIST_DEP OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_VARIABLE DIST_DEP OUTPUT_STRIP_TRAILING_WHITESPACE)
set(PACKAGE_FILE_NAME set(PACKAGE_FILE_NAME
${PROJECT_NAME}_${PROJECT_VERSION}-${DIST_NAME}-${DIST_VER}-${ARCH}) ${PROJECT_NAME}_${DIST_NAME}-${DIST_VER}-${ARCH})
set(CPACK_DEBIAN_FILE_NAME ${PACKAGE_FILE_NAME}.deb) set(CPACK_DEBIAN_FILE_NAME ${PACKAGE_FILE_NAME}.deb)
set(CPACK_DEBIAN_PACKAGE_DEPENDS ${DIST_DEP}) set(CPACK_DEBIAN_PACKAGE_DEPENDS ${DIST_DEP})
@@ -177,7 +177,7 @@ foreach(x RANGE ${DIST_LISTLEN})
set(DOCKER_IMAGE mscp-${DIST_NAME}:${DIST_VER}) set(DOCKER_IMAGE mscp-${DIST_NAME}:${DIST_VER})
set(DOCKER_INDEX ${DIST_NAME}-${DIST_VER}) set(DOCKER_INDEX ${DIST_NAME}-${DIST_VER})
set(PKG_FILE_NAME set(PKG_FILE_NAME
mscp_${PROJECT_VERSION}-${DIST_NAME}-${DIST_VER}-${ARCH}.${DIST_PKG}) mscp_${DIST_NAME}-${DIST_VER}-${ARCH}.${DIST_PKG})
add_custom_target(docker-build-${DOCKER_INDEX} add_custom_target(docker-build-${DOCKER_INDEX}
COMMENT "Build mscp in ${DOCKER_IMAGE} container" COMMENT "Build mscp in ${DOCKER_IMAGE} container"

3
docker/alpine-3.17.Dockerfile
View File

@@ -24,8 +24,7 @@ RUN cd ${mscpdir} \
-DBUILD_CONAN=ON -DBUILD_STATIC=ON \ -DBUILD_CONAN=ON -DBUILD_STATIC=ON \
&& make \ && make \
&& cp mscp /usr/bin/ \ && cp mscp /usr/bin/ \
&& cp mscp /mscp/build/mscp_$(cat ${mscpdir}/VERSION)-alpine-3.17-x86_64.static \ && cp mscp /mscp/build/mscp_alpine-3.17-x86_64.static
&& cp mscp /mscp/build/mscp.linux.x86.static
# copy mscp to PKG FILE NAME because this build doesn't use CPACK # copy mscp to PKG FILE NAME because this build doesn't use CPACK