added missing patch version . fix patch action for windows (#2592)

This commit is contained in:
Antonis Stamatiou 2023-03-08 16:12:29 +02:00 committed by GitHub
parent 49ed221659
commit f8ae0076eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 13 deletions

View file

@ -8,4 +8,4 @@ runs:
- name: ci/generate-version - name: ci/generate-version
id: generate-version id: generate-version
shell: bash shell: bash
run: go run ${{ github.action_path }}/patch-version.go . run: go run ${GITHUB_ACTION_PATH}/patch-version.go . # https://github.com/orgs/community/discussions/25910

View file

@ -23,6 +23,8 @@ jobs:
node-version-file: "package.json" node-version-file: "package.json"
cache: "npm" cache: "npm"
cache-dependency-path: package-lock.json cache-dependency-path: package-lock.json
- name: nightly/patch-version
uses: ./.github/actions/patch-nightly-version
- name: ci/install-dependencies - name: ci/install-dependencies
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
@ -31,8 +33,6 @@ jobs:
wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v4.20.1/yq_linux_amd64 && chmod a+x /usr/local/bin/yq wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v4.20.1/yq_linux_amd64 && chmod a+x /usr/local/bin/yq
sudo apt-get update || true && sudo apt-get install -y ca-certificates libxtst-dev libpng++-dev gcc-aarch64-linux-gnu g++-aarch64-linux-gnu jq icnsutils graphicsmagick tzdata sudo apt-get update || true && sudo apt-get install -y ca-certificates libxtst-dev libpng++-dev gcc-aarch64-linux-gnu g++-aarch64-linux-gnu jq icnsutils graphicsmagick tzdata
npm ci npm ci
- name: nightly/patch-version
uses: ./.github/actions/patch-nightly-version
- name: ci/build - name: ci/build
run: | run: |
mkdir -p ./build/linux mkdir -p ./build/linux
@ -57,6 +57,8 @@ jobs:
node-version-file: "package.json" node-version-file: "package.json"
cache: "npm" cache: "npm"
cache-dependency-path: package-lock.json cache-dependency-path: package-lock.json
- name: nightly/patch-version
uses: ./.github/actions/patch-nightly-version
- name: nightly/optimize - name: nightly/optimize
shell: powershell shell: powershell
run: ./scripts/Makefile.ps1 optimize run: ./scripts/Makefile.ps1 optimize
@ -64,11 +66,12 @@ jobs:
shell: powershell shell: powershell
run: | run: |
./scripts/Makefile.ps1 install-deps ./scripts/Makefile.ps1 install-deps
npm ci npm i -g node-gyp
node-gyp install
node-gyp install --devdir="C:\Users\runneradmin\.electron-gyp" --target=$(jq -r .devDependencies.electron package.json) --dist-url="https://electronjs.org/headers"
npm ci --openssl_fips=''
- name: nightly/test - name: nightly/test
uses: ./.github/actions/test uses: ./.github/actions/test
- name: nightly/patch-version
uses: ./.github/actions/patch-nightly-version
- name: nightly/build - name: nightly/build
shell: powershell shell: powershell
env: env:
@ -109,6 +112,8 @@ jobs:
node-version-file: "package.json" node-version-file: "package.json"
cache: "npm" cache: "npm"
cache-dependency-path: package-lock.json cache-dependency-path: package-lock.json
- name: nightly/patch-version
uses: ./.github/actions/patch-nightly-version
- name: nightly/install-dependencies - name: nightly/install-dependencies
run: | run: |
brew install yq brew install yq
@ -137,14 +142,14 @@ jobs:
node-version-file: "package.json" node-version-file: "package.json"
cache: "npm" cache: "npm"
cache-dependency-path: package-lock.json cache-dependency-path: package-lock.json
- name: nightly/patch-version
uses: ./.github/actions/patch-nightly-version
- name: nightly/install-dependencies - name: nightly/install-dependencies
run: | run: |
brew install yq rename brew install yq rename
npm ci npm ci
- name: nightly/test - name: nightly/test
uses: ./.github/actions/test uses: ./.github/actions/test
- name: nightly/patch-version
uses: ./.github/actions/patch-nightly-version
- name: nightly/build - name: nightly/build
env: env:
APPLEID: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID }} APPLEID: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID }}

View file

@ -25,6 +25,8 @@ jobs:
node-version-file: "package.json" node-version-file: "package.json"
cache: "npm" cache: "npm"
cache-dependency-path: package-lock.json cache-dependency-path: package-lock.json
- name: nightly/patch-version
uses: ./.github/actions/patch-nightly-version
- name: nightly/optimize - name: nightly/optimize
shell: powershell shell: powershell
run: ./scripts/Makefile.ps1 optimize run: ./scripts/Makefile.ps1 optimize
@ -32,11 +34,12 @@ jobs:
shell: powershell shell: powershell
run: | run: |
./scripts/Makefile.ps1 install-deps ./scripts/Makefile.ps1 install-deps
npm ci npm i -g node-gyp
node-gyp install
node-gyp install --devdir="C:\Users\runneradmin\.electron-gyp" --target=$(jq -r .devDependencies.electron package.json) --dist-url="https://electronjs.org/headers"
npm ci --openssl_fips=''
- name: nightly/test - name: nightly/test
uses: ./.github/actions/test uses: ./.github/actions/test
- name: nightly/patch-version
uses: ./.github/actions/patch-nightly-version
- name: nightly/build - name: nightly/build
shell: powershell shell: powershell
env: env:
@ -69,14 +72,14 @@ jobs:
node-version-file: "package.json" node-version-file: "package.json"
cache: "npm" cache: "npm"
cache-dependency-path: package-lock.json cache-dependency-path: package-lock.json
- name: nightly/patch-version
uses: ./.github/actions/patch-nightly-version
- name: nightly/install-dependencies - name: nightly/install-dependencies
run: | run: |
brew install yq rename brew install yq rename
npm ci npm ci
- name: nightly/test - name: nightly/test
uses: ./.github/actions/test uses: ./.github/actions/test
- name: nightly/patch-version
uses: ./.github/actions/patch-nightly-version
- name: nightly/build - name: nightly/build
env: env:
APPLEID: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID }} APPLEID: ${{ secrets.MM_DESKTOP_MAC_INSTALLER_APPLE_ID }}