Skip to content

Commit

Permalink
Merge pull request #431 from steilerDev/dev
Browse files Browse the repository at this point in the history
stage for beta release
  • Loading branch information
Frank Steiler authored Nov 27, 2023
2 parents bb8bc84 + 61ba48e commit f4c3543
Show file tree
Hide file tree
Showing 28 changed files with 1,522 additions and 578 deletions.
119 changes: 90 additions & 29 deletions .github/actions/helper/prepare-semantic-release/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .github/actions/helper/prepare-semantic-release/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"devDependencies": {
"@backtrace-labs/javascript-cli": "^0.1.2",
"@semantic-release-plus/docker": "^3.1.3",
"@semantic-release/github": "^9.2.1",
"@semantic-release/release-notes-generator": "^12.0.1",
"@semantic-release/github": "^9.2.3",
"@semantic-release/release-notes-generator": "^12.1.0",
"conventional-changelog": "^5.1.0",
"conventional-changelog-conventionalcommits": "^7.0.2",
"semantic-release": "^22.0.7"
"semantic-release": "^22.0.8"
}
}
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ updates:
labels: [ ]
directory: "/"
target-branch: "dev"
open-pull-requests-limit: 20
commit-message:
prefix: "chore: [ci] "
schedule:
Expand All @@ -19,6 +20,8 @@ updates:
labels: [ ]
directory: "/app"
target-branch: "dev"
versioning-strategy: "increase"
open-pull-requests-limit: 50
commit-message:
prefix: "chore: [app] "
schedule:
Expand Down Expand Up @@ -64,6 +67,7 @@ updates:
labels: [ ]
directory: "/docker"
target-branch: "dev"
open-pull-requests-limit: 10
commit-message:
prefix: "chore: [docker] "
schedule:
Expand All @@ -79,6 +83,8 @@ updates:
labels: [ ]
directory: "/docs"
target-branch: "dev"
versioning-strategy: "increase"
open-pull-requests-limit: 10
commit-message:
prefix: "chore: [docs] "
schedule:
Expand All @@ -96,6 +102,8 @@ updates:
labels: [ ]
directory: "/.github/actions/helper/prepare-semantic-release"
target-branch: "dev"
versioning-strategy: "increase"
open-pull-requests-limit: 10
commit-message:
prefix: "chore: [semantic-release] "
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.DS_Store
.vscode/*.env
*.zip
app-data-dir/
test-data/
2 changes: 2 additions & 0 deletions .vscode/icloud-photos-sync.cspell
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ pano
parens
photoshop
photoslibrary
photoview
polystat
postbuild
prerequest
Expand Down Expand Up @@ -112,6 +113,7 @@ typedoc
udse
upterm
uptermd
viktorstrate
vivaxy
Vvye
vyas
Expand Down
7 changes: 4 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
],
"preLaunchTask": "Build App",
"program": "${workspaceFolder}/app/src/main.ts",
"args": ["token"],
"args": ["sync"],
"outFiles": [
"${workspaceFolder}/app/build/out/**/*.js",
],
"env": {
"NODE_NO_WARNINGS": "1"
},
"envFile": "${workspaceFolder}/.vscode/test.env"
"envFile": "${workspaceFolder}/.vscode/adp-test.env"
}, {
"name": "Run API Tests",
"type": "node",
Expand Down Expand Up @@ -65,14 +65,15 @@
"--runInBand",
"--config", "jest.config.json",
//"--detectOpenHandles",
"test/unit/icloud.test.ts"
"test/unit/resources.network-manager.test.ts"
],
"env": {
"NODE_NO_WARNINGS": "1"
},
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"cwd": "${workspaceFolder}/app",
"envFile": "${workspaceFolder}/.vscode/api-test.env"
},
]
}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ This CLI Application offers the following high level functionality:
</details>

<details>
<summary><i>Archiving of folders</i></summary>
<summary><i>Archiving of folders (optional)</i></summary>
<p>
<ul>
<li>All assets currently in the album will be persisted in the respective folder on the machine running icloud-photos-sync</li>
<li>Archiving an album will persist all assets in the respective folder in the local filesystem</li>
<li>Future syncs will ignore the folder (so those assets will not be changed/deleted)</li>
<li>If the remote album is moved, the archived folder will be moved to the same location</li>
<li>If the remote album is deleted, the archived folder will be put into a 'lost+found' type of folder</li>
Expand Down
Loading

0 comments on commit f4c3543

Please sign in to comment.