From 56ef6ac502fc636438dc4de08bf30c8b47fa97bb Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Wed, 29 Jan 2025 22:57:06 +0100 Subject: [PATCH] Beta more carefull while renaming files and update artifact names --- .github/workflows/ci.yml | 8 ++++---- forge.config.js | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57f602b3..d6ac20c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -147,7 +147,7 @@ jobs: BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g') echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV - echo "BUILD_NAMEarm64=inav-configurator_darwin_arm64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV + echo "BUILD_NAMEarm64=inav-configurator_MacOS_arm64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV - uses: actions/setup-node@v4 with: node-version: 20 @@ -196,7 +196,7 @@ jobs: BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g') echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV - echo "BUILD_NAMEx64=inav-configurator_darwin_x64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV + echo "BUILD_NAMEx64=inav-configurator_MacOS_x64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV - uses: actions/setup-node@v4 with: node-version: 20 @@ -248,7 +248,7 @@ jobs: VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g') echo "ACTIONS_STEP_DEBUG=true" >> $GITHUB_ENV echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV - echo "BUILD_NAMEx64=inav-configurator_win32_x64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV + echo "BUILD_NAMEx64=inav-configurator_Windows64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV shell: bash - uses: actions/setup-node@v4 with: @@ -302,7 +302,7 @@ jobs: VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g') echo "ACTIONS_STEP_DEBUG=true" >> $GITHUB_ENV echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV - echo "BUILD_NAMEia32=inav-configurator_win32_ia32_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV + echo "BUILD_NAMEia32=inav-configurator_Windows32_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV shell: bash - uses: actions/setup-node@v4 with: diff --git a/forge.config.js b/forge.config.js index d7b8d4a8..e1567cf2 100644 --- a/forge.config.js +++ b/forge.config.js @@ -11,6 +11,8 @@ module.exports = { "^(\/support$)", ".gitattributes", ".gitignore", + ".github", + ".git", "3D_model_creation.md", "LICENSE", "MAPPROXY.md", @@ -27,9 +29,9 @@ module.exports = { result.artifacts.forEach(artifact => { var artifactStr = artifact.toString(); var newPath = path.join(path.dirname(artifactStr), baseName + path.extname(artifactStr)); - newPath = newPath.replace('win32_ia32', 'Win32'); - newPath = newPath.replace('win32_x64', 'Win64'); - newPath = newPath.replace('darwin', 'MacOS'); + newPath = newPath.replace('Configurator_win32_ia32', 'Configurator_Win32'); + newPath = newPath.replace('Configurator_win32_x64', 'Configurator_Win64'); + newPath = newPath.replace('Configurator_darwin', 'Configurator_MacOS'); fs.renameSync(artifactStr, newPath); console.log('Artifact: ' + newPath); });