Use double quotes in CI yaml and cache pip with pyproject.toml

beeware · Feb 7, 2023 · 4b8d858 · 4b8d858
1 parent dffa5ce
commit 4b8d858
Show file tree

Hide file tree

Showing 8 changed files with 151 additions and 155 deletions.
diff --git a/.github/actions/install-briefcase/action.yml b/.github/actions/install-briefcase/action.yml
@@ -3,25 +3,25 @@ description: Installs a version of Briefcase appropriate for the context.
 
 inputs:
   briefcase-url:
-    description: 'URL to Briefcase git repository.'
-    default: 'https://github.com/beeware/briefcase.git'
+    description: "URL to Briefcase git repository."
+    default: "https://github.com/beeware/briefcase.git"
   briefcase-default-branch:
-    description: 'Briefcase''s default branch.'
-    default: 'main'
+    description: "Briefcase's default branch."
+    default: "main"
   briefcase-override-version:
-    description: 'Version of Briefcase to install without it being derived; e.g. v0.3.12'
+    description: "Version of Briefcase to install without it being derived; e.g. v0.3.12"
     required: false
   testing-pr-ref:
-    description: 'Override value for github.base_ref; only for testing.'
+    description: "Override value for github.base_ref; only for testing."
     required: false
   testing-ref-name:
-    description: 'Override value for github.ref_name; only for testing.'
+    description: "Override value for github.ref_name; only for testing."
     required: false
 
 outputs:
   installed-version:
     value: ${{ steps.briefcase.outputs.version }}
-    description: 'The version or branch of Briefcase that was installed.'
+    description: "The version or branch of Briefcase that was installed."
 
 runs:
   using: composite

diff --git a/.github/actions/install-win-store-python/action.yml b/.github/actions/install-win-store-python/action.yml
@@ -3,8 +3,8 @@ description: Installs Python from the Windows Store
 
 inputs:
   python-version:
-    description: 'Python version to install'
-    default: '3.11'  # should default to the latest Python
+    description: "Python version to install"
+    default: "3.11"  # should default to the latest Python
     required: false
 
 runs:

diff --git a/.github/workflows/verify-app-build.yml → .github/workflows/app-build-verify.yml b/.github/workflows/verify-app-build.yml → .github/workflows/app-build-verify.yml
@@ -9,32 +9,32 @@ on:
   workflow_call:
     inputs:
       python-version:
-        description: 'Python version to use; defaults to latest Python release.'
-        default: '3.X'
+        description: "Python version to use; defaults to latest Python release."
+        default: "3.X"
         type: string
       python-source:
-        description: 'Where to install python from; i.e. github or winstore.'
-        default: 'github'
+        description: "Where to install python from; i.e. github or winstore."
+        default: "github"
         type: string
       runner-os:
-        description: 'The OS to use to build the App; must be a fully qualified GitHub runner OS, e.g. ubuntu-latest.'
+        description: "The OS to use to build the App; must be a fully qualified GitHub runner OS, e.g. ubuntu-latest."
         required: true
         type: string
       framework:
-        description: 'Framework to use to build the App, e.g. toga.'
+        description: "Framework to use to build the App, e.g. toga."
         required: true
         type: string
       repository:
-        description: 'GitHub repository to checkout; defaults to repo running this workflow.'
+        description: "GitHub repository to checkout; defaults to repo running this workflow."
         default: ${{ github.repository }}
         type: string
       target-platform:
-        description: 'The target platform for the app, i.e. linux, macos, or windows. Leave blank all supported platforms.'
-        default: ''
+        description: "The target platform for the app, i.e. linux, macos, or windows. Leave blank all supported platforms."
+        default: ""
         type: string
       target-format:
-        description: 'The target format for the app, e.g. appimage, xcode, app, etc. Leave blank all supported formats.'
-        default: ''
+        description: "The target format for the app, e.g. appimage, xcode, app, etc. Leave blank all supported formats."
+        default: ""
         type: string
 
 defaults:
@@ -53,19 +53,11 @@ jobs:
         repository: ${{ inputs.repository }}
         fetch-depth: 0
 
-#    - name: Checkout beeware/.github
-#      uses: actions/checkout@v3.3.0
-#      with:
-#        repository: 'beeware/.github'
-#        path: 'beeware-.github'
-
-    # TODO:PR: replace with commented block above before merging
-    - name: Checkout rmartin16/.github-beeware
+    - name: Checkout beeware/.github
       uses: actions/checkout@v3.3.0
       with:
-        repository: 'rmartin16/.github-beeware'
-        path: 'beeware-.github'
-        ref: 'shared-ci'
+        repository: "beeware/.github"
+        path: "beeware-.github"
 
     - name: Package name
       id: package
@@ -124,14 +116,14 @@ jobs:
     - name: Install Briefcase artifact
       if: endsWith(inputs.repository, 'briefcase')
       run: python -m pip install dist/briefcase-*.whl
-      
+
     - name: Install Briefcase
-      if: endsWith(inputs.repository, 'briefcase') != true
+      if: ${{ !endsWith(inputs.repository, 'briefcase') }}
       uses: ./beeware-.github/.github/actions/install-briefcase
 
     - name: Create Briefcase project
       # Don't run for template repos since they already contain a created app.
-      if: endsWith(inputs.repository, '-template') != true
+      if: ${{ !endsWith(inputs.repository, '-template') }}
       run: |
         cd tests/apps
         cat verify-${{ inputs.framework }}.config | briefcase new