Skip to content

Commit

Permalink
Remove satispress and use own packagist
Browse files Browse the repository at this point in the history
  • Loading branch information
oxyc committed Aug 31, 2024
1 parent 92140b2 commit 599f070
Show file tree
Hide file tree
Showing 8 changed files with 291 additions and 451 deletions.
8 changes: 0 additions & 8 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ inputs:
required: true
packagist_github_token:
required: true
satispress_api_key:
required: true
satispress_password:
required: true

runs:
using: 'composite'
Expand Down Expand Up @@ -37,10 +33,6 @@ runs:
env:
COMPOSER_TOKEN: ${{ inputs.packagist_github_token }}

- name: Configure basic http authentication for Composer
shell: bash
run: composer config --global http-basic.satispress.generodigital.com ${{ inputs.satispress_api_key }} ${{ inputs.satispress_password }}

- name: Get Composer Cache Directory
id: composer-cache
shell: bash
Expand Down
18 changes: 9 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ updates:
interval: "weekly"
day: "sunday"
registries:
- fortawesome
- fontawesome
groups:
production-dependencies:
dependency-type: "production"
Expand All @@ -19,7 +19,7 @@ updates:
interval: "weekly"
day: "sunday"
registries:
- satispress
- github-generoi
groups:
production-dependencies:
dependency-type: "production"
Expand All @@ -33,12 +33,12 @@ updates:
day: "sunday"

registries:
satispress:
type: composer-repository
url: https://satispress.generodigital.com/satispress/
username: ${{ secrets.SATISPRESS_API_KEY }}
password: ${{ secrets.SATISPRESS_PASSWORD }}
fortawesome:
github-generoi:
type: git
url: https://github.com
username: x-access-token
password: ${{ secrets.PACKAGIST_GITHUB_TOKEN }}
fontawesome:
type: npm-registry
url: //npm.fontawesome.com/
token: ${{ secrets.NPM_FONTAWESOME_AUTH_TOKEN }}
token: ${{ secrets.NPM_FONTAWESOME_AUTH_TOKEN }}
6 changes: 0 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ on:
required: true
PACKAGIST_GITHUB_TOKEN:
required: true
SATISPRESS_API_KEY:
required: true
SATISPRESS_PASSWORD:
required: true
NPM_FONTAWESOME_AUTH_TOKEN:
required: true
jobs:
Expand All @@ -39,8 +35,6 @@ jobs:
with:
npm_fontawesome_auth_token: ${{ secrets.NPM_FONTAWESOME_AUTH_TOKEN }}
packagist_github_token: ${{ secrets.PACKAGIST_GITHUB_TOKEN }}
satispress_api_key: ${{ secrets.SATISPRESS_API_KEY }}
satispress_password: ${{ secrets.SATISPRESS_PASSWORD }}

- name: Install development packages to run tests
run: composer install:development
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ jobs:
with:
npm_fontawesome_auth_token: ${{ secrets.NPM_FONTAWESOME_AUTH_TOKEN }}
packagist_github_token: ${{ secrets.PACKAGIST_GITHUB_TOKEN }}
satispress_api_key: ${{ secrets.SATISPRESS_API_KEY }}
satispress_password: ${{ secrets.SATISPRESS_PASSWORD }}

- name: Install development packages to run tests
run: composer install:development
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/vulnerability-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:
with:
npm_fontawesome_auth_token: ${{ secrets.NPM_FONTAWESOME_AUTH_TOKEN }}
packagist_github_token: ${{ secrets.PACKAGIST_GITHUB_TOKEN }}
satispress_api_key: ${{ secrets.SATISPRESS_API_KEY }}
satispress_password: ${{ secrets.SATISPRESS_PASSWORD }}

- name: Install development packages and build assets
run: composer install:development
Expand Down
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ _See [roots/bedrock](https://github.com/roots/bedrock#readme) readme for notes a
- Prettier - [Installation](https://prettier.io/docs/en/editors.html)
- EditorConfig - [Installation](https://editorconfig.org/#download)

### Authenticate with satispress

You will need to create a user-specific API key on satispress.generodigital.com. Note that the API key is used as the username and the password is always `satispress`.

composer config --global http-basic.satispress.generodigital.com <API-KEY> satispress

### Authenticate with fontawesome registry

You will need an authentication token, we have a shared one added to LastPass/1Password.
Expand Down
16 changes: 5 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,7 @@
},
{
"type": "composer",
"url": "https://packagist.minasithil.genero.fi/"
},
{
"type": "composer",
"url": "https://satispress.generodigital.com/satispress/"
"url": "https://generoi.github.io/packagist/"
}
],
"require": {
Expand All @@ -62,23 +58,21 @@
"wp-cli/wp-cli-bundle": "^2.9",
"aaemnnosttv/wp-cli-login-command": "^1.5",
"wpackagist-plugin/show-environment-in-admin-bar": "^1.1",
"jameelmoses/wordpress-kint-debugger": "^2.0",
"wpackagist-plugin/query-monitor": "^3.3",
"wpackagist-plugin/user-switching": "^1.5",
"roots/acorn": "^4.0",
"log1x/navi": "^3.0",
"log1x/sage-svg": "^2.0",
"generoi/sage-nativeblock": "^0.3",
"stoutlogic/acf-builder": "^1.12",
"spatie/laravel-google-fonts": "^1.2",
"generoi/sage-woocommerce": "^1.1",
"generoi/sage-cachetags": "^1.1",
"wpackagist-plugin/safe-svg": "^2.1",
"wpackagist-plugin/limit-login-attempts-reloaded": "^2.6.1",
"wpackagist-plugin/wp-sanitize-file-name-plus": "^1.0",
"satispress/advanced-custom-fields-pro": "^6.0",
"satispress/gravityforms": "^2.4",
"satispress/polylang-pro": "^3.3",
"generoi/advanced-custom-fields-pro": "^6.0",
"generoi/gravityforms": "^2.4",
"generoi/polylang-pro": "^3.3",
"wpackagist-plugin/wordpress-seo": "^23.0",
"wpackagist-plugin/google-tag-manager": "^1.0",
"wpackagist-plugin/redirection": "^5.0",
Expand Down Expand Up @@ -173,7 +167,7 @@
"languageRootDir": "web/app/languages"
},
"patches": {
"satispress/advanced-custom-fields-pro": {
"generoi/advanced-custom-fields-pro": {
"Fix get_block_wrapper_attributes not working with ACF preview": "./config/patches/acf-get_block_wrapper_attributes.patch"
},
"aaemnnosttv/wp-cli-login-command": {
Expand Down
Loading

0 comments on commit 599f070

Please sign in to comment.