From f208ca30a841f769c376fdcf2cf777af0767bd1a Mon Sep 17 00:00:00 2001 From: auouymous Date: Mon, 5 Aug 2024 16:13:31 -0600 Subject: [PATCH 1/2] Build for Mac on Github. --- .github/workflows/release-from-macos.yml | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/release-from-macos.yml diff --git a/.github/workflows/release-from-macos.yml b/.github/workflows/release-from-macos.yml new file mode 100644 index 000000000..a4f199b9b --- /dev/null +++ b/.github/workflows/release-from-macos.yml @@ -0,0 +1,31 @@ +name: release from macos + +on: [push, pull_request] + +jobs: + release-from-macos: + name: build + if: >- + github.event_name == 'push' || + github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name + + runs-on: macos-12 + env: + BUNDLE_TAG: 24.8.5 + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 # fetch tags + - run: > + curl -L -o "pythonbase-$BUNDLE_TAG.zip" "https://github.com/gpodder/gpodder-osx-bundle/releases/download/$BUNDLE_TAG/pythonbase-$BUNDLE_TAG.zip"; + curl -L -o "pythonbase-$BUNDLE_TAG.zip.sha256" "https://github.com/gpodder/gpodder-osx-bundle/releases/download/$BUNDLE_TAG/pythonbase-$BUNDLE_TAG.zip.sha256"; + saved_hash=$(awk '{print $1;}' < "pythonbase-$BUNDLE_TAG.zip.sha256"); + comp_hash=$(openssl sha256 "pythonbase-$BUNDLE_TAG.zip" | awk '{print $2;}'); + if [ "$saved_hash" != "$comp_hash" ]; then echo "E: $saved_hash != $comp_hash"; exit 1; else echo "valid hash"; fi; + LC_CTYPE=C.UTF-8 LANG=C.UTF-8 tools/mac-osx/release_on_mac.sh "$(pwd)/pythonbase-$BUNDLE_TAG.zip" || exit 1; + rm -Rf tools/mac-osx/_build/{gPodder.app,*.deps.zip*,gPodder.contents,run-*,gpo,gpodder-migrate2tres} + - uses: actions/upload-artifact@v4 + with: + name: release + path: /Users/runner/work/gpodder/gpodder/tools/mac-osx/_build/ + retention-days: 30 From d6a2a25e5fbf7439ba078be95e35345cb133fa47 Mon Sep 17 00:00:00 2001 From: auouymous Date: Tue, 6 Aug 2024 01:16:30 -0600 Subject: [PATCH 2/2] Remove the CircleCI workflow. --- .circleci/config.yml | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 75273f220..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,31 +0,0 @@ -# :noTabs=true:mode=yaml:tabSize=2:indentSize=2: -version: 2 -jobs: - release-from-macos: - macos: - xcode: "13.4.1" - shell: /bin/bash --login -o pipefail - environment: - - BUNDLE_TAG: 24.8.5 - steps: - - checkout - - run: > - curl -L -o "pythonbase-$BUNDLE_TAG.zip" "https://github.com/gpodder/gpodder-osx-bundle/releases/download/$BUNDLE_TAG/pythonbase-$BUNDLE_TAG.zip"; - curl -L -o "pythonbase-$BUNDLE_TAG.zip.sha256" "https://github.com/gpodder/gpodder-osx-bundle/releases/download/$BUNDLE_TAG/pythonbase-$BUNDLE_TAG.zip.sha256"; - saved_hash=$(awk '{print $1;}' < "pythonbase-$BUNDLE_TAG.zip.sha256"); - comp_hash=$(openssl sha256 "pythonbase-$BUNDLE_TAG.zip" | awk '{print $2;}'); - if [ "$saved_hash" != "$comp_hash" ]; then echo "E: $saved_hash != $comp_hash"; exit 1; else echo "valid hash"; fi; - LC_CTYPE=C.UTF-8 LANG=C.UTF-8 tools/mac-osx/release_on_mac.sh "$(pwd)/pythonbase-$BUNDLE_TAG.zip" || exit 1; - rm -Rf tools/mac-osx/_build/{gPodder.app,*.deps.zip*,gPodder.contents,run-*,gpo,gpodder-migrate2tres} - - store_artifacts: - path: tools/mac-osx/_build/ - -workflows: - version: 2 - build-bundle: - jobs: - - release-from-macos: - filters: - branches: - ignore: - - adaptive