Skip to content

Commit 63d868b

Browse files
gocomgocom
committed
Resolving CI issues
1 parent e7dcbde commit 63d868b

File tree

6 files changed

+106
-85
lines changed

6 files changed

+106
-85
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ indent_style = space
88
insert_final_newline = true
99
trim_trailing_whitespace = true
1010

11+
[*.{yml,yaml}]
12+
indent_size = 2
13+
1114
[Makefile]
1215
indent_style = tab

‎.github/workflows/ci.yml‎

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,31 @@ name: CI
33
on: [push]
44

55
jobs:
6-
build:
7-
name: Build
8-
runs-on: ubuntu-latest
9-
env:
10-
COMPOSER_HOME: ./.composer
11-
12-
steps:
13-
- name: Checkout
14-
uses: actions/checkout@v3
15-
16-
- name: Setup
17-
run: mkdir -p "$COMPOSER_HOME"
18-
19-
- name: Lint
20-
run: make lint
21-
22-
- name: Build
23-
id: build
24-
uses: gocom/action-textpattern-package-plugin@master
25-
26-
- name: Upload Compressed Plugin Installer Artifact
27-
uses: actions/upload-artifact@v3
28-
with:
29-
name: ${{ steps.build.outputs.name }}_sha${{ github.sha }}_zip.txt
30-
path: ${{ github.workspace }}/${{ steps.build.outputs.compressed }}
31-
32-
- name: Upload Uncompressed Plugin Installer Artifact
33-
uses: actions/upload-artifact@v3
34-
with:
35-
name: ${{ steps.build.outputs.name }}_sha${{ github.sha }}.txt
36-
path: ${{ github.workspace }}/${{ steps.build.outputs.uncompressed }}
6+
build:
7+
name: Build
8+
runs-on: ubuntu-latest
9+
env:
10+
COMPOSER_HOME: ./.composer
11+
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v4
15+
16+
- name: Lint
17+
run: make lint
18+
19+
- name: Build
20+
id: build
21+
uses: gocom/action-textpattern-package-plugin@master
22+
23+
- name: Upload Compressed Plugin Installer Artifact
24+
uses: actions/upload-artifact@v4
25+
with:
26+
name: ${{ steps.build.outputs.name }}_sha${{ github.sha }}_zip.txt
27+
path: ${{ github.workspace }}/${{ steps.build.outputs.compressed }}
28+
29+
- name: Upload Uncompressed Plugin Installer Artifact
30+
uses: actions/upload-artifact@v4
31+
with:
32+
name: ${{ steps.build.outputs.name }}_sha${{ github.sha }}.txt
33+
path: ${{ github.workspace }}/${{ steps.build.outputs.uncompressed }}

‎.github/workflows/release.yml‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
name: Release
22

33
on:
4-
push:
5-
tags:
6-
- '*.*.*'
4+
push:
5+
tags:
6+
- '*.*.*'
77

88
jobs:
9-
build:
10-
name: Create Release
11-
runs-on: ubuntu-latest
12-
13-
steps:
14-
- name: Checkout
15-
uses: actions/checkout@v3
16-
17-
- name: Build
18-
id: build
19-
uses: gocom/action-textpattern-package-plugin@master
20-
21-
- name: Changelog
22-
id: changelog
23-
run: |
24-
echo "contents<<CHANGELOGEOF" >> $GITHUB_OUTPUT
25-
sed -e '1,/h2. Changelog/d' README.textile | sed -e '1,/h3./d' -e '/h3./,$d' | sed 's/@/`/g' >> $GITHUB_OUTPUT
26-
echo "CHANGELOGEOF" >> $GITHUB_OUTPUT
27-
28-
- name: Create Release
29-
id: create_release
30-
uses: shogo82148/actions-create-release@v1
31-
with:
32-
body: ${{ steps.changelog.outputs.contents }}
33-
34-
- name: Upload Compressed Plugin Installer
35-
uses: shogo82148/actions-upload-release-asset@v1
36-
with:
37-
upload_url: ${{ steps.create_release.outputs.upload_url }}
38-
asset_path: ${{ github.workspace }}/${{ steps.build.outputs.compressed }}
39-
asset_name: ${{ steps.build.outputs.name }}_v${{ steps.build.outputs.version }}_zip.txt
40-
asset_content_type: text/plain
41-
42-
- name: Upload Uncompressed Plugin Installer
43-
uses: shogo82148/actions-upload-release-asset@v1
44-
with:
45-
upload_url: ${{ steps.create_release.outputs.upload_url }}
46-
asset_path: ${{ github.workspace }}/${{ steps.build.outputs.uncompressed }}
47-
asset_name: ${{ steps.build.outputs.name }}_v${{ steps.build.outputs.version }}.txt
48-
asset_content_type: text/plain
9+
build:
10+
name: Create Release
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
17+
- name: Build
18+
id: build
19+
uses: gocom/action-textpattern-package-plugin@master
20+
21+
- name: Changelog
22+
id: changelog
23+
run: |
24+
echo "contents<<CHANGELOGEOF" >> $GITHUB_OUTPUT
25+
sed -e '1,/h2. Changelog/d' README.textile | sed -e '1,/h3./d' -e '/h3./,$d' | sed 's/@/`/g' >> $GITHUB_OUTPUT
26+
echo "CHANGELOGEOF" >> $GITHUB_OUTPUT
27+
28+
- name: Create Release
29+
id: create_release
30+
uses: shogo82148/actions-create-release@v1
31+
with:
32+
body: ${{ steps.changelog.outputs.contents }}
33+
34+
- name: Upload Compressed Plugin Installer
35+
uses: shogo82148/actions-upload-release-asset@v1
36+
with:
37+
upload_url: ${{ steps.create_release.outputs.upload_url }}
38+
asset_path: ${{ github.workspace }}/${{ steps.build.outputs.compressed }}
39+
asset_name: ${{ steps.build.outputs.name }}_v${{ steps.build.outputs.version }}_zip.txt
40+
asset_content_type: text/plain
41+
42+
- name: Upload Uncompressed Plugin Installer
43+
uses: shogo82148/actions-upload-release-asset@v1
44+
with:
45+
upload_url: ${{ steps.create_release.outputs.upload_url }}
46+
asset_path: ${{ github.workspace }}/${{ steps.build.outputs.uncompressed }}
47+
asset_name: ${{ steps.build.outputs.name }}_v${{ steps.build.outputs.version }}.txt
48+
asset_content_type: text/plain

‎Makefile‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
.PHONY: all clean compile help lint lint-fix
1+
.PHONY: all clean compile help lint lint-fix shell test
22

3-
PHP = docker-compose run --rm php
3+
HOST_UID ?= `id -u`
4+
HOST_GID ?= `id -g`
5+
PHP = docker compose run --rm -u $(HOST_UID):$(HOST_GID) php
46

57
all: lint
68

79
vendor:
810
$(PHP) composer install
911

1012
clean:
11-
$(PHP) rm -rf vendor composer.lock
13+
$(PHP) bash -c 'rm -rf dist vendor composer.lock'
1214

1315
lint: vendor
1416
$(PHP) composer lint
@@ -19,6 +21,11 @@ lint-fix: vendor
1921
compile: vendor
2022
$(PHP) composer compile
2123

24+
shell: vendor
25+
$(PHP) bash
26+
27+
test: lint
28+
2229
help:
2330
@echo "Manage project"
2431
@echo ""
@@ -27,17 +34,23 @@ help:
2734
@echo ""
2835
@echo "Commands:"
2936
@echo ""
37+
@echo " $$ make clean"
38+
@echo " Delete installed dependencies"
39+
@echo ""
40+
@echo " $$ make compile"
41+
@echo " Compiles the plugin"
42+
@echo ""
3043
@echo " $$ make lint"
3144
@echo " Lint code style"
3245
@echo ""
3346
@echo " $$ make lint-fix"
3447
@echo " Lint and fix code style"
3548
@echo ""
36-
@echo " $$ make compile"
37-
@echo " Compiles the plugin"
49+
@echo " $$ make shell"
50+
@echo " Log in to the container"
3851
@echo ""
39-
@echo " $$ make clean"
40-
@echo " Delete installed dependencies"
52+
@echo " $$ make test"
53+
@echo " Run test suite, including linter"
4154
@echo ""
4255
@echo " $$ make vendor"
4356
@echo " Install dependencies"

‎README.textile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ bc. $ make compile
3232

3333
h2. Changelog
3434

35+
h3. Version 0.5.6 - 2025/07/16
36+
37+
* Fix failing GitHub Actions by migrating from `docker-compose` command to `docker compose`.
38+
* Update composer image to version 2.8.
39+
* Update actions/checkout to version 4.
40+
* Update actions/upload-artifact to version 4.
41+
3542
h3. Version 0.5.5 - 2023/02/18
3643

3744
* Update release changelog extraction to convert Textile's @code@ formatting to Markdown syntax to avoid including false mentions in the release message.

‎docker-compose.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
version: '3.2'
2-
31
services:
42
php:
5-
image: composer:2.3
3+
image: composer:2.8
64
volumes:
75
- .:/app
8-
- ${COMPOSER_HOME:-$HOME/.composer}:/tmp
6+
- ${COMPOSER_HOME:-$HOME/.composer}:/composer
97
networks:
108
- app
9+
environment:
10+
- COMPOSER_ROOT_VERSION=dev-master
11+
- COMPOSER_HOME=/composer
1112

1213
networks:
1314
app:

0 commit comments

Comments
 (0)