ci: Remove Google Drive upload, and Always upload to github
This commit is contained in:
parent
660fb9daff
commit
6eacf0ec55
4 changed files with 11 additions and 24 deletions
8
.github/actions/dist-upload/action.yml
vendored
8
.github/actions/dist-upload/action.yml
vendored
|
|
@ -1,7 +1,7 @@
|
||||||
name: "Distribute upload"
|
name: "Distribute upload"
|
||||||
description: "Uploads the package from the dist dir to GitHub artifacts or Google Drive"
|
description: "Uploads the package from the dist dir to GitHub artifacts or Google Drive"
|
||||||
inputs:
|
inputs:
|
||||||
use_github:
|
use-github:
|
||||||
description: "Whether to upload to GitHub artifacts"
|
description: "Whether to upload to GitHub artifacts"
|
||||||
required: true
|
required: true
|
||||||
|
|
||||||
|
|
@ -33,9 +33,9 @@ runs:
|
||||||
using: "composite"
|
using: "composite"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- if: ${{ inputs.use_gdrive == inputs.use_github }}
|
- if: ${{ inputs.use_gdrive == inputs.use-github }}
|
||||||
run: |
|
run: |
|
||||||
echo "Either 'use_github' or 'use_gdrive' must be true (and not both)"
|
echo "Either 'use-github' or 'use_gdrive' must be true (and not both)"
|
||||||
exit 1
|
exit 1
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
|
|
@ -52,7 +52,7 @@ runs:
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Upload to GitHub
|
- name: Upload to GitHub
|
||||||
if: ${{ inputs.use_github == 'true' }}
|
if: ${{ inputs.use-github == 'true' }}
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: ${{ inputs.github-target-filename }}
|
name: ${{ inputs.github-target-filename }}
|
||||||
|
|
|
||||||
22
.github/workflows/ci.yml
vendored
22
.github/workflows/ci.yml
vendored
|
|
@ -23,9 +23,7 @@ env:
|
||||||
DESKFLOW_PRODUCT_NAME: ${{ vars.DESKFLOW_PRODUCT_NAME }}
|
DESKFLOW_PRODUCT_NAME: ${{ vars.DESKFLOW_PRODUCT_NAME }}
|
||||||
DESKFLOW_PACKAGE_PREFIX: ${{ vars.DESKFLOW_PACKAGE_PREFIX || 'deskflow' }}
|
DESKFLOW_PACKAGE_PREFIX: ${{ vars.DESKFLOW_PACKAGE_PREFIX || 'deskflow' }}
|
||||||
PACKAGE_BUILD: ${{ !github.event.pull_request.draft }}
|
PACKAGE_BUILD: ${{ !github.event.pull_request.draft }}
|
||||||
PACKAGE_UPLOAD: ${{ !github.event.pull_request.draft && github.ref_name != 'master' }}
|
PACKAGE_UPLOAD: ${{ !github.event.pull_request.draft }}
|
||||||
UPLOAD_TO_GITHUB: ${{ github.event_name == 'pull_request' && !github.event.pull_request.draft }}
|
|
||||||
UPLOAD_TO_GDRIVE: ${{ github.event_name != 'pull_request' }}
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
setup:
|
setup:
|
||||||
|
|
@ -122,12 +120,8 @@ jobs:
|
||||||
if: ${{ vars.CI_ENABLE_PACKAGING && env.PACKAGE_UPLOAD == 'true' }}
|
if: ${{ vars.CI_ENABLE_PACKAGING && env.PACKAGE_UPLOAD == 'true' }}
|
||||||
uses: ./.github/actions/dist-upload
|
uses: ./.github/actions/dist-upload
|
||||||
with:
|
with:
|
||||||
use_github: ${{ env.UPLOAD_TO_GITHUB }}
|
use-github: true
|
||||||
use_gdrive: ${{ env.UPLOAD_TO_GDRIVE }}
|
|
||||||
github-target-filename: "${{ env.DESKFLOW_PACKAGE_PREFIX }}-${{ matrix.target.name }}"
|
github-target-filename: "${{ env.DESKFLOW_PACKAGE_PREFIX }}-${{ matrix.target.name }}"
|
||||||
gdrive-target-base-dir: ${{ vars.GDRIVE_TARGET_BASE_DIR }}
|
|
||||||
gdrive-secret-key: ${{ secrets.GOOGLE_DRIVE_KEY }}
|
|
||||||
gdrive-parent-folder-id: ${{ secrets.GOOGLE_DRIVE_TECH_DRIVE }}
|
|
||||||
package-version: ${{ env.DESKFLOW_VERSION }}
|
package-version: ${{ env.DESKFLOW_VERSION }}
|
||||||
|
|
||||||
macos:
|
macos:
|
||||||
|
|
@ -209,12 +203,8 @@ jobs:
|
||||||
if: ${{ vars.CI_ENABLE_PACKAGING && env.PACKAGE_UPLOAD == 'true' }}
|
if: ${{ vars.CI_ENABLE_PACKAGING && env.PACKAGE_UPLOAD == 'true' }}
|
||||||
uses: ./.github/actions/dist-upload
|
uses: ./.github/actions/dist-upload
|
||||||
with:
|
with:
|
||||||
use_github: ${{ env.UPLOAD_TO_GITHUB }}
|
use-github: true
|
||||||
use_gdrive: ${{ env.UPLOAD_TO_GDRIVE }}
|
|
||||||
github-target-filename: "${{ env.DESKFLOW_PACKAGE_PREFIX }}-${{ matrix.target.name }}"
|
github-target-filename: "${{ env.DESKFLOW_PACKAGE_PREFIX }}-${{ matrix.target.name }}"
|
||||||
gdrive-target-base-dir: ${{ vars.GDRIVE_TARGET_BASE_DIR }}
|
|
||||||
gdrive-secret-key: ${{ secrets.GOOGLE_DRIVE_KEY }}
|
|
||||||
gdrive-parent-folder-id: ${{ secrets.GOOGLE_DRIVE_TECH_DRIVE }}
|
|
||||||
package-version: ${{ env.DESKFLOW_VERSION }}
|
package-version: ${{ env.DESKFLOW_VERSION }}
|
||||||
|
|
||||||
linux-matrix:
|
linux-matrix:
|
||||||
|
|
@ -294,12 +284,8 @@ jobs:
|
||||||
if: ${{ vars.CI_ENABLE_PACKAGING && env.PACKAGE_UPLOAD == 'true' }}
|
if: ${{ vars.CI_ENABLE_PACKAGING && env.PACKAGE_UPLOAD == 'true' }}
|
||||||
uses: ./.github/actions/dist-upload
|
uses: ./.github/actions/dist-upload
|
||||||
with:
|
with:
|
||||||
use_github: ${{ env.UPLOAD_TO_GITHUB }}
|
use-github: true
|
||||||
use_gdrive: ${{ env.UPLOAD_TO_GDRIVE }}
|
|
||||||
github-target-filename: "${{ env.DESKFLOW_PACKAGE_PREFIX }}-${{ matrix.distro.name }}"
|
github-target-filename: "${{ env.DESKFLOW_PACKAGE_PREFIX }}-${{ matrix.distro.name }}"
|
||||||
gdrive-target-base-dir: ${{ vars.GDRIVE_TARGET_BASE_DIR }}
|
|
||||||
gdrive-secret-key: ${{ secrets.GOOGLE_DRIVE_KEY }}
|
|
||||||
gdrive-parent-folder-id: ${{ secrets.GOOGLE_DRIVE_TECH_DRIVE }}
|
|
||||||
package-version: ${{ env.DESKFLOW_VERSION }}
|
package-version: ${{ env.DESKFLOW_VERSION }}
|
||||||
|
|
||||||
# Technically, "unix" is a misnomer, but we use it here to mean "Unix-like BSD-derived".
|
# Technically, "unix" is a misnomer, but we use it here to mean "Unix-like BSD-derived".
|
||||||
|
|
|
||||||
2
.github/workflows/test-dist-upload.yml
vendored
2
.github/workflows/test-dist-upload.yml
vendored
|
|
@ -24,7 +24,7 @@ jobs:
|
||||||
if:
|
if:
|
||||||
uses: ./.github/actions/dist-upload
|
uses: ./.github/actions/dist-upload
|
||||||
with:
|
with:
|
||||||
use_github: true
|
use-github: true
|
||||||
github-target-filename: "test"
|
github-target-filename: "test"
|
||||||
|
|
||||||
- name: Upload to Google Drive
|
- name: Upload to Google Drive
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,13 @@
|
||||||
|
|
||||||
Bug fixes:
|
Bug fixes:
|
||||||
|
|
||||||
|
- #7522 Fix broken CI caused by renaming project to Deskflow
|
||||||
- #7524 Restore protocol compatibility with Synergy
|
- #7524 Restore protocol compatibility with Synergy
|
||||||
|
- #7525 Remove Google Drive upload from CI
|
||||||
|
|
||||||
Enhancements:
|
Enhancements:
|
||||||
|
|
||||||
- #7519 Rename project to Deskflow (was Synergy Community Edition)
|
- #7519 Rename project to Deskflow (was Synergy Community Edition)
|
||||||
- #7522 Fix broken CI caused by renaming project to Deskflow
|
|
||||||
|
|
||||||
# 1.16.1
|
# 1.16.1
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue