From edb78d3936fe5fe529910c76f7acb311a6760a0e Mon Sep 17 00:00:00 2001 From: david-swift Date: Mon, 7 Oct 2024 09:14:05 +0200 Subject: [PATCH] Migrate to the Aparoksha gitea instance --- .../ISSUE_TEMPLATE/bug_report.yml | 0 .../ISSUE_TEMPLATE/feature_request.yml | 0 {.github => .gitea}/PULL_REQUEST_TEMPLATE.md | 0 {.github => .gitea}/workflows/docs.yml | 33 +++++++------------ {.github => .gitea}/workflows/swiftlint.yml | 8 ++--- .gitignore | 1 - .swiftlint.yml | 5 --- Package.swift | 7 ++-- README.md | 10 +++--- Sources/MetaSQLite.docc/MetaSQLite.md | 2 +- 10 files changed, 26 insertions(+), 40 deletions(-) rename {.github => .gitea}/ISSUE_TEMPLATE/bug_report.yml (100%) rename {.github => .gitea}/ISSUE_TEMPLATE/feature_request.yml (100%) rename {.github => .gitea}/PULL_REQUEST_TEMPLATE.md (100%) rename {.github => .gitea}/workflows/docs.yml (57%) rename {.github => .gitea}/workflows/swiftlint.yml (74%) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.gitea/ISSUE_TEMPLATE/bug_report.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/bug_report.yml rename to .gitea/ISSUE_TEMPLATE/bug_report.yml diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.gitea/ISSUE_TEMPLATE/feature_request.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/feature_request.yml rename to .gitea/ISSUE_TEMPLATE/feature_request.yml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.gitea/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from .github/PULL_REQUEST_TEMPLATE.md rename to .gitea/PULL_REQUEST_TEMPLATE.md diff --git a/.github/workflows/docs.yml b/.gitea/workflows/docs.yml similarity index 57% rename from .github/workflows/docs.yml rename to .gitea/workflows/docs.yml index d028e13..61e7fa2 100644 --- a/.github/workflows/docs.yml +++ b/.gitea/workflows/docs.yml @@ -4,21 +4,9 @@ on: push: branches: ["main"] -permissions: - contents: read - pages: write - id-token: write - -concurrency: - group: "pages" - cancel-in-progress: true - jobs: - Deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: macos-15 + publish: + runs-on: david-macbook steps: - uses: actions/checkout@v4 - name: Build Docs @@ -31,15 +19,16 @@ jobs: xcrun docc process-archive transform-for-static-hosting \ "$PWD/.derivedData/Build/Products/Debug/MetaSQLite.doccarchive" \ --output-path "docs" \ - --hosting-base-path "meta-sqlite" + --hosting-base-path "/" - name: Modify Docs run: | - echo "" > docs/index.html; + echo "

Please enable JavaScript to view the documentation here.

" > docs/index.html; sed -i '' 's/,2px/,10px/g' docs/css/index.*.css - - name: Upload Artifact - uses: actions/upload-pages-artifact@v3 + - name: Upload + uses: wangyucode/sftp-upload-action@v2.0.2 with: - path: 'docs' - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 + host: 'volans.uberspace.de' + username: 'akforum' + password: ${{ secrets.password }} + localDir: 'docs' + remoteDir: '/var/www/virtual/akforum/meta-sqlite.aparoksha.dev/' \ No newline at end of file diff --git a/.github/workflows/swiftlint.yml b/.gitea/workflows/swiftlint.yml similarity index 74% rename from .github/workflows/swiftlint.yml rename to .gitea/workflows/swiftlint.yml index 5348bdb..ed7c3ad 100644 --- a/.github/workflows/swiftlint.yml +++ b/.gitea/workflows/swiftlint.yml @@ -3,17 +3,17 @@ name: SwiftLint on: push: paths: - - '.github/workflows/swiftlint.yml' + - '.gitea/workflows/swiftlint.yml' - '.swiftlint.yml' - '**/*.swift' pull_request: paths: - - '.github/workflows/swiftlint.yml' + - '.gitea/workflows/swiftlint.yml' - '.swiftlint.yml' - '**/*.swift' workflow_dispatch: paths: - - '.github/workflows/swiftlint.yml' + - '.gitea/workflows/swiftlint.yml' - '.swiftlint.yml' - '**/*.swift' @@ -21,7 +21,7 @@ jobs: SwiftLint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: SwiftLint uses: norio-nomura/action-swiftlint@3.2.1 with: diff --git a/.gitignore b/.gitignore index e1c5612..3c890f6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,4 @@ DerivedData/ /Package.resolved .Ulysses-Group.plist /.docc-build -/io.github.AparokshaUI.Generation.json /.vscode \ No newline at end of file diff --git a/.swiftlint.yml b/.swiftlint.yml index 8de0e3f..0ae2516 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -94,11 +94,6 @@ disabled_rules: # Custom Rules custom_rules: - github_issue: - name: 'GitHub Issue' - regex: '//.(TODO|FIXME):.(?!.*(https://github\.com/AparokshaUI/meta-sqlite/issues/\d))' - message: 'The related GitHub issue must be included in a TODO or FIXME.' - severity: warning fatal_error: name: 'Fatal Error' diff --git a/Package.swift b/Package.swift index f3e24ba..c86e53b 100644 --- a/Package.swift +++ b/Package.swift @@ -22,13 +22,16 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/AparokshaUI/Meta", branch: "main"), + .package(url: "https://git.aparoksha.dev/aparoksha/meta", branch: "main"), .package(url: "https://github.com/stephencelis/SQLite.swift", from: "0.15.3") ], targets: [ .target( name: "MetaSQLite", - dependencies: ["Meta", .product(name: "SQLite", package: "SQLite.swift")], + dependencies: [ + .product(name: "Meta", package: "meta"), + .product(name: "SQLite", package: "SQLite.swift") + ], path: "Sources" ), .executableTarget( diff --git a/README.md b/README.md index 305e506..92abfb2 100644 --- a/README.md +++ b/README.md @@ -3,22 +3,22 @@

- + Documentation ยท - - GitHub + + Code

-_SQLite for Meta_ is a simple extension for the [Meta](https://aparokshaui.github.io/Meta) framework remembering state data between app launches. +_SQLite for Meta_ is a simple extension for the [Meta](https://meta.aparoksha.dev/) framework remembering state data between app launches. ## Thanks ### Dependencies -- [Meta](https://github.com/AparokshaUI/Meta) licensed under the [MIT License](https://github.com/AparokshaUI/Meta/blob/main/LICENSE.md) +- [Meta](https://git.aparoksha.dev/aparoksha/meta) licensed under the [MIT License](https://git.aparoksha.dev/aparoksha/meta/src/branch/main/LICENSE.md) - [SQLite.swift](https://github.com/stephencelis/SQLite.swift) licensed under the [MIT License](https://github.com/stephencelis/SQLite.swift/blob/master/LICENSE.txt) ### Other Thanks diff --git a/Sources/MetaSQLite.docc/MetaSQLite.md b/Sources/MetaSQLite.docc/MetaSQLite.md index 8fb7461..9ba210b 100644 --- a/Sources/MetaSQLite.docc/MetaSQLite.md +++ b/Sources/MetaSQLite.docc/MetaSQLite.md @@ -1,4 +1,4 @@ # ``MetaSQLite`` -_SQLite for Meta_ is a simple extension for the [Meta](https://aparokshaui.github.io/Meta) framework remembering state data between app launches. +_SQLite for Meta_ is a simple extension for the [Meta](https://meta.aparoksha.dev/) framework, remembering state data between app launches.