ci: update

Figma-Linux · Nov 18, 2023 · c896e5a · c896e5a
1 parent 72b4adb
commit c896e5a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/manualrun_launchpad.yml b/.github/workflows/manualrun_launchpad.yml
@@ -19,5 +19,5 @@ jobs:
     uses: ./.github/workflows/reuse_launchpad.yml
     needs: setup
     secrets: inherit
-    env:
-      FIGMA_LINUX_REV: "${{ github.event.inputs.rev }}"
+    with:
+      rev: "${{ github.event.inputs.rev }}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -66,12 +66,6 @@ jobs:
   launchpad:
     name: Upload
     uses: ./.github/workflows/reuse_launchpad.yml
-    secrets:
-      GPG_PUB_KEY: ${{ secrets.GPG_PUB_KEY }}
-      GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
-      GPG_PASSPHRASE_KEY: ${{ secrets.GPG_PASSPHRASE_KEY }}
-      ID_RSA: ${{ secrets.ID_RSA }}
-      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    rev:
       FIGMA_LINUX_REV: 1
     needs: [release_amd64, release_arm64v8]
diff --git a/.github/workflows/reuse_launchpad.yml b/.github/workflows/reuse_launchpad.yml
@@ -1,6 +1,11 @@
 name: Launchpad PPA
 
-on: workflow_call
+on:
+  workflow_call:
+    inputs:
+      rev:
+        required: true
+        type: string
 
 jobs:
   launchpad:
@@ -41,4 +46,4 @@ jobs:
 
       - name: Build and Upload PPA
         run: |
-          ./scripts/build_ppa.sh "${FIGMA_LINUX_REV}"
+          ./scripts/build_ppa.sh "${{ github.event.inputs.rev }}"