Skip to content

Commit

Permalink
Merge pull request #28 from LyraPhase/update-to-3.11.4
Browse files Browse the repository at this point in the history
Update to 3.11.4
  • Loading branch information
trinitronx authored Mar 16, 2022
2 parents 2244635 + 3187bd7 commit ed9eb31
Show file tree
Hide file tree
Showing 6 changed files with 107 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/clear_github_actions_cache
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1647410082
80 changes: 80 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
---
name: ci

"on":
pull_request:
branches:
- master
- main
- develop
push:
branches:
- master
- main
- develop
env:
debug_ci: false
jobs:
test:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-11]
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Set BREWFILE_PATH env var
run: |
echo "BREWFILE_PATH=${GITHUB_WORKSPACE}/Brewfile.ci" >> $GITHUB_ENV
- uses: webfactory/[email protected]
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
- name: Add SSH_AUTH_SOCK to user shell .profile
run: |
sudo tee -a ~/.profile <<EOPROFILE
SSH_AUTH_SOCK=${{ env.SSH_AUTH_SOCK }}
EOPROFILE
- name: Configure global git SSH URLs
run: |
git config --global url."[email protected]:".insteadOf "https://github.com/"
- name: Configure Homebrew cache
uses: actions/cache@v2
with:
path: |
~/Library/Caches/Homebrew/*--*
~/Library/Caches/Homebrew/downloads/*--*
~/Library/Caches/Homebrew/Cask/*--*
key: brew-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.github/clear_github_actions_cache') }}-${{ hashFiles( env.BREWFILE_PATH, '**/Brewfile.lock.json') }}
restore-keys: |
brew-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.github/clear_github_actions_cache') }}-${{ hashFiles( env.BREWFILE_PATH, '**/Brewfile.lock.json') }}
brew-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.github/clear_github_actions_cache') }}
- name: Run brew update
run: |
brew update
- name: Install dependencies & Clean homebrew cache
run: |
brew cleanup
brew bundle install --file=${BREWFILE_PATH}
- name: DEBUG - GitHub Workspace
run: |
echo GITHUB_WORKSPACE=$GITHUB_WORKSPACE
if: env.debug_ci == true
- name: DEBUG - Print all shell env exports
run: export -p
if: env.debug_ci == true
- name: DEBUG - List workspace and Homebrew contents
run: |
ls -lR ${GITHUB_WORKSPACE}
ls -lR /usr/local/Homebrew
if: env.debug_ci == true
- name: Run tap install
run: make install
- name: Run test & install
run: |
make test
- name: Upload install.log on failure
if: ${{ failure() }}
uses: actions/upload-artifact@v3
with:
name: Build failure logs
path: /var/log/install.log
10 changes: 9 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,21 @@ version: ~> 1.0
os: osx
language: objective-c
osx_image: xcode12.5
cache:
directories:
- $HOME/Library/Caches/Homebrew
addons:
homebrew:
brewfile: Brewfile.travis
brewfile: Brewfile.ci
update: true
before_cache:
- brew cleanup
install:
- make install
script:
- make test
jobs:
fast_finish: true
after_failure: |
echo "DEBUG: Contents of /var/log/install.log"
cat /var/log/install.log
File renamed without changes.
12 changes: 6 additions & 6 deletions Casks/pcloud-drive.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@

cask "pcloud-drive" do
if Hardware::CPU.intel?
version "3.11.3"
version "3.11.4"
elsif Hardware::CPU.physical_cpu_arm64?
version "3.11.2"
version "3.11.4"
end

if Hardware::CPU.intel?
sha256 "c8c9e9d71c7ddefd744b9cff9f23726cf93a8dd576e92be59edc7665ec6d2458"
sha256 "772581869c2cece613cc16ea954a5cd2275a1b4a5d2aa95d876480bd5436bbf3"

pkg "pCloud Drive #{version.to_s}.pkg"

code = "XZoudkVZkrqJSySbpMBP9KYcHmaFABY4I7n7"
code = "XZkiyVVZbNzHvVkMPiyUdW7EjPyLguoyu0QV"
else
sha256 "0b1a484c304f7c6324d7565ed788ce41382fd35a2f870803241055d9b9d5c6c6"
sha256 "9338ca82340a2e421c144f926bfd99d9598b3df104d0737918d89c5b28898d02"

pkg "pCloud Drive #{version.to_s} M1.pkg"

code = "XZDVGyVZoR8eOjA1HDVgFANKU7vT2XS7G6UV"
code = "XZHiyVVZY6pQSWzTKUVdpTon2mDqGh4PhUyk"
end

url do
Expand Down
11 changes: 11 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,16 @@ test: install ## Run tests
brew install --cask --verbose $(CASK_NAME)
pkgutil --pkgs=com.mobileinno.pkg.pCloudDrive

.github/clear_github_actions_cache:
date +%s > .github/clear_github_actions_cache

.PHONY: clean-github-cache-file clear-github-cache
clear-github-cache: clean-github-cache-file .github/clear_github_actions_cache ## Force GitHub Actions Cache key to change for fresh CI run
git add .github/clear_github_actions_cache
git commit -m "Clear GitHub Actions Cache @ $$(cat .github/clear_github_actions_cache)"

clean-github-cache-file: ## Remove GitHub Actions Cache timestamp invalidator file.
[ -f '.github/clear_github_actions_cache' ] && rm -f '.github/clear_github_actions_cache' || true

clean:: ## Remove temporary/build files.
rm -rf $(TAP_DIR)/$(REPO_NAME)

0 comments on commit ed9eb31

Please sign in to comment.