Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Move to FoF #1

Merged
merged 9 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: S3 Assets PHP

on: [workflow_dispatch, push, pull_request]

jobs:
run:
uses: flarum/framework/.github/workflows/[email protected]
with:
enable_backend_testing: false
enable_phpstan: true
php_versions: '["8.0", "8.1", "8.2", "8.3", "8.4"]'

backend_directory: .
39 changes: 0 additions & 39 deletions .github/workflows/build.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: S3 Assets JS

on: [workflow_dispatch, push, pull_request]

jobs:
run:
uses: flarum/framework/.github/workflows/[email protected]
with:
enable_bundlewatch: false
enable_prettier: true
enable_typescript: false

frontend_directory: ./js
backend_directory: .
js_package_manager: yarn
main_git_branch: master

secrets:
bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# S3 Assets
# FoF S3 Assets

A [Flarum](http://flarum.org) extension. Relocate Flarum disks onto S3 or compatible bucket

Expand All @@ -7,13 +7,13 @@ A [Flarum](http://flarum.org) extension. Relocate Flarum disks onto S3 or compat
Install with composer:

```sh
composer require blomstra/s3-assets:"*"
composer require fof/s3-assets:"*"
```

## Updating

```sh
composer update blomstra/s3-assets
composer update fof/s3-assets
php flarum cache:clear
```

Expand Down Expand Up @@ -45,5 +45,4 @@ php flarum s3:move

## Links

- [Extiverse](https://extiverse.com/extension/blomstra/s3-assets)
- [Discuss](https://discuss.flarum.org/d/PUT_DISCUSS_SLUG_HERE)
65 changes: 54 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,44 +1,87 @@
{
"name": "blomstra/s3-assets",
"name": "fof/s3-assets",
"description": "Relocate Flarum disks onto S3 or compatible bucket",
"keywords": [
"flarum"
],
"type": "flarum-extension",
"license": "proprietary",
"homepage": "https://blomstra.net",
"license": "MIT",
"support": {
"email": "[email protected]"
"issues": "https://github.com/FriendsOfFlarum/s3-assets/issues",
"source": "https://github.com/FriendsOfFlarum/s3-assets",
"forum": "https://discuss.flarum.org/d/"
},
"homepage": "https://friendsofflarum.org",
"require": {
"php": "^8.0",
"flarum/core": "^1.3.1",
"league/flysystem-aws-s3-v3": "*",
"vlucas/phpdotenv": "^5.4"
},
"funding": [
{
"type": "website",
"url": "https://opencollective.com/fof/donate"
}
],
"authors": [
{
"name": "Team Blomstra",
"email": "[email protected]",
"name": "IanM",
"email": "[email protected]",
"role": "Developer"
}
],
"autoload": {
"psr-4": {
"Blomstra\\S3Assets\\": "src/"
"FoF\\S3Assets\\": "src/"
}
},
"extra": {
"flarum-extension": {
"title": "S3 Assets",
"title": "FoF S3 Assets",
"category": "feature",
"icon": {
"name": "fas fa-box",
"backgroundColor": "#EBF1FD",
"color": "#3a98d0"
"backgroundColor": "#e74c3c",
"color": "#fff"
}
},
"optional-dependencies": [
"fof/upload"
]
],
"flarum-cli": {
"modules": {
"githubActions": true,
"backendTesting": true
}
}
},
"autoload-dev": {
"psr-4": {
"FoF\\S3Assets\\Tests\\": "tests/"
}
},
"scripts": {
"analyse:phpstan": "phpstan analyse",
"clear-cache:phpstan": "phpstan clear-result-cache",
"test": [
"@test:unit",
"@test:integration"
],
"test:unit": "phpunit -c tests/phpunit.unit.xml",
"test:integration": "phpunit -c tests/phpunit.integration.xml",
"test:setup": "@php tests/integration/setup.php"
},
"scripts-descriptions": {
"analyse:phpstan": "Run static analysis",
"test": "Runs all tests.",
"test:unit": "Runs all unit tests.",
"test:integration": "Runs all integration tests.",
"test:setup": "Sets up a database for use with integration tests. Execute this only once."
},
"require-dev": {
"flarum/testing": "^1.0.0",
"flarum/phpstan": "*",
"fof/upload": "*"
}
}
8 changes: 4 additions & 4 deletions extend.php
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?php

/*
* This file is part of blomstra/s3-assets.
* This file is part of fof/s3-assets.
*
* Copyright (c) 2022 Blomstra Ltd.
* Copyright (c) FriendsOfFlarum
*
* For the full copyright and license information, please view the LICENSE.md
* file that was distributed with this source code.
*/

namespace Blomstra\S3Assets;
namespace FoF\S3Assets;

use Blomstra\S3Assets\Extend\Drivers;
use Flarum\Extend;
use FoF\S3Assets\Extend\Drivers;

return [
(new Extend\Frontend('admin'))
Expand Down
File renamed without changes.
Loading
Loading