Skip to content

Commit ed9eb31

Browse files
authored
Merge pull request #28 from LyraPhase/update-to-3.11.4
Update to 3.11.4
2 parents 2244635 + 3187bd7 commit ed9eb31

6 files changed

Lines changed: 107 additions & 7 deletions

File tree

.github/clear_github_actions_cache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1647410082

.github/workflows/ci.yml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
---
2+
name: ci
3+
4+
"on":
5+
pull_request:
6+
branches:
7+
- master
8+
- main
9+
- develop
10+
push:
11+
branches:
12+
- master
13+
- main
14+
- develop
15+
env:
16+
debug_ci: false
17+
jobs:
18+
test:
19+
runs-on: ${{ matrix.os }}
20+
strategy:
21+
matrix:
22+
os: [macos-11]
23+
steps:
24+
- name: Check out code
25+
uses: actions/checkout@v2
26+
- name: Set BREWFILE_PATH env var
27+
run: |
28+
echo "BREWFILE_PATH=${GITHUB_WORKSPACE}/Brewfile.ci" >> $GITHUB_ENV
29+
- uses: webfactory/ssh-agent@v0.5.4
30+
with:
31+
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
32+
- name: Add SSH_AUTH_SOCK to user shell .profile
33+
run: |
34+
sudo tee -a ~/.profile <<EOPROFILE
35+
SSH_AUTH_SOCK=${{ env.SSH_AUTH_SOCK }}
36+
EOPROFILE
37+
- name: Configure global git SSH URLs
38+
run: |
39+
git config --global url."git@github.com:".insteadOf "https://github.com/"
40+
- name: Configure Homebrew cache
41+
uses: actions/cache@v2
42+
with:
43+
path: |
44+
~/Library/Caches/Homebrew/*--*
45+
~/Library/Caches/Homebrew/downloads/*--*
46+
~/Library/Caches/Homebrew/Cask/*--*
47+
key: brew-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.github/clear_github_actions_cache') }}-${{ hashFiles( env.BREWFILE_PATH, '**/Brewfile.lock.json') }}
48+
restore-keys: |
49+
brew-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.github/clear_github_actions_cache') }}-${{ hashFiles( env.BREWFILE_PATH, '**/Brewfile.lock.json') }}
50+
brew-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.github/clear_github_actions_cache') }}
51+
- name: Run brew update
52+
run: |
53+
brew update
54+
- name: Install dependencies & Clean homebrew cache
55+
run: |
56+
brew cleanup
57+
brew bundle install --file=${BREWFILE_PATH}
58+
- name: DEBUG - GitHub Workspace
59+
run: |
60+
echo GITHUB_WORKSPACE=$GITHUB_WORKSPACE
61+
if: env.debug_ci == true
62+
- name: DEBUG - Print all shell env exports
63+
run: export -p
64+
if: env.debug_ci == true
65+
- name: DEBUG - List workspace and Homebrew contents
66+
run: |
67+
ls -lR ${GITHUB_WORKSPACE}
68+
ls -lR /usr/local/Homebrew
69+
if: env.debug_ci == true
70+
- name: Run tap install
71+
run: make install
72+
- name: Run test & install
73+
run: |
74+
make test
75+
- name: Upload install.log on failure
76+
if: ${{ failure() }}
77+
uses: actions/upload-artifact@v3
78+
with:
79+
name: Build failure logs
80+
path: /var/log/install.log

.travis.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,21 @@ version: ~> 1.0
22
os: osx
33
language: objective-c
44
osx_image: xcode12.5
5+
cache:
6+
directories:
7+
- $HOME/Library/Caches/Homebrew
58
addons:
69
homebrew:
7-
brewfile: Brewfile.travis
10+
brewfile: Brewfile.ci
811
update: true
12+
before_cache:
13+
- brew cleanup
914
install:
1015
- make install
1116
script:
1217
- make test
1318
jobs:
1419
fast_finish: true
20+
after_failure: |
21+
echo "DEBUG: Contents of /var/log/install.log"
22+
cat /var/log/install.log
File renamed without changes.

Casks/pcloud-drive.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@
2323

2424
cask "pcloud-drive" do
2525
if Hardware::CPU.intel?
26-
version "3.11.3"
26+
version "3.11.4"
2727
elsif Hardware::CPU.physical_cpu_arm64?
28-
version "3.11.2"
28+
version "3.11.4"
2929
end
3030

3131
if Hardware::CPU.intel?
32-
sha256 "c8c9e9d71c7ddefd744b9cff9f23726cf93a8dd576e92be59edc7665ec6d2458"
32+
sha256 "772581869c2cece613cc16ea954a5cd2275a1b4a5d2aa95d876480bd5436bbf3"
3333

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

36-
code = "XZoudkVZkrqJSySbpMBP9KYcHmaFABY4I7n7"
36+
code = "XZkiyVVZbNzHvVkMPiyUdW7EjPyLguoyu0QV"
3737
else
38-
sha256 "0b1a484c304f7c6324d7565ed788ce41382fd35a2f870803241055d9b9d5c6c6"
38+
sha256 "9338ca82340a2e421c144f926bfd99d9598b3df104d0737918d89c5b28898d02"
3939

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

42-
code = "XZDVGyVZoR8eOjA1HDVgFANKU7vT2XS7G6UV"
42+
code = "XZHiyVVZY6pQSWzTKUVdpTon2mDqGh4PhUyk"
4343
end
4444

4545
url do

Makefile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,16 @@ test: install ## Run tests
2727
brew install --cask --verbose $(CASK_NAME)
2828
pkgutil --pkgs=com.mobileinno.pkg.pCloudDrive
2929

30+
.github/clear_github_actions_cache:
31+
date +%s > .github/clear_github_actions_cache
32+
33+
.PHONY: clean-github-cache-file clear-github-cache
34+
clear-github-cache: clean-github-cache-file .github/clear_github_actions_cache ## Force GitHub Actions Cache key to change for fresh CI run
35+
git add .github/clear_github_actions_cache
36+
git commit -m "Clear GitHub Actions Cache @ $$(cat .github/clear_github_actions_cache)"
37+
38+
clean-github-cache-file: ## Remove GitHub Actions Cache timestamp invalidator file.
39+
[ -f '.github/clear_github_actions_cache' ] && rm -f '.github/clear_github_actions_cache' || true
40+
3041
clean:: ## Remove temporary/build files.
3142
rm -rf $(TAP_DIR)/$(REPO_NAME)

0 commit comments

Comments
 (0)