Skip to content

Commit 1999e1d

Browse files
committed
Update GitHub Actions to v4/v3, simplify PHP version detection to use DEMYX_PHP environment variable, and remove obsolete CLI and PHP 7.4 build references
1 parent c249550 commit 1999e1d

1 file changed

Lines changed: 6 additions & 12 deletions

File tree

.github/workflows/main.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
DEMYX_REPOSITORY: wordpress
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
- name: Login
19-
uses: docker/login-action@v1
19+
uses: docker/login-action@v3
2020
with:
2121
username: demyx
2222
password: ${{ secrets.DOCKER_TOKEN }}
@@ -27,8 +27,6 @@ jobs:
2727
docker pull demyx/mariadb
2828
docker build -t demyx/${{ env.DEMYX_REPOSITORY }} tag-latest
2929
docker build -t demyx/${{ env.DEMYX_REPOSITORY }}:bedrock tag-bedrock
30-
#docker build -t demyx/${{ env.DEMYX_REPOSITORY }}:cli tag-cli
31-
#docker build -t demyx/${{ env.DEMYX_REPOSITORY }}:7.4 tag-7.4
3230
- name: Test
3331
id: test
3432
shell: 'script -q -e -c "bash {0}"'
@@ -117,19 +115,17 @@ jobs:
117115
DEMYX_WORDPRESS_ALPINE_VERSION="$(docker exec ${{ env.DEMYX_REPOSITORY }} cat /etc/os-release | grep VERSION_ID | cut -c 12-)"
118116
DEMYX_WORDPRESS_VERSION="$(docker exec ${{ env.DEMYX_REPOSITORY }} wp core version)"
119117
DEMYX_WORDPRESS_BEDROCK_VERSION="$(curl -sL https://api.github.com/repos/roots/bedrock/releases/latest | jq -r '.tag_name')"
120-
DEMYX_WORDPRESS_CLI_VERSION="$(docker exec ${{ env.DEMYX_REPOSITORY }} --version | awk -F '[ ]' '{print $2}')"
121-
DEMYX_WORDPRESS_PHP_VERSION="$(docker exec ${{ env.DEMYX_REPOSITORY }} php82 -v | grep cli | awk -F '[ ]' '{print $2}')"
122-
DEMYX_WORDPRESS_PHP_LATEST_VERSION="$(docker exec ${{ env.DEMYX_REPOSITORY }} php -v | grep cli | awk -F '[ ]' '{print $2}')"
123-
DEMYX_JQ="$(jq ".alpine = \"$DEMYX_WORDPRESS_ALPINE_VERSION\" | .wordpress = \"$DEMYX_WORDPRESS_VERSION\" | .bedrock = \"$DEMYX_WORDPRESS_BEDROCK_VERSION\" | .wp_cli = \"$DEMYX_WORDPRESS_CLI_VERSION\" | .php = \"$DEMYX_WORDPRESS_PHP_VERSION\" | .php81 = \"$DEMYX_WORDPRESS_PHP_LATEST_VERSION\"" version.json)"
118+
DEMYX_WORDPRESS_CLI_VERSION="$(docker exec ${{ env.DEMYX_REPOSITORY }} wp --version | awk -F '[ ]' '{print $2}')"
119+
DEMYX_WORDPRESS_PHP_VERSION="$(docker exec ${{ env.DEMYX_REPOSITORY }} bash -c 'echo $DEMYX_PHP')"
120+
DEMYX_JQ="$(jq ".alpine = \"$DEMYX_WORDPRESS_ALPINE_VERSION\" | .wordpress = \"$DEMYX_WORDPRESS_VERSION\" | .bedrock = \"$DEMYX_WORDPRESS_BEDROCK_VERSION\" | .wp_cli = \"$DEMYX_WORDPRESS_CLI_VERSION\" | .php = \"$DEMYX_WORDPRESS_PHP_VERSION\"" version.json)"
124121
125122
# Update versions
126123
echo "$DEMYX_JQ" > version.json
127124
echo "DEMYX_WORDPRESS_ALPINE_VERSION=$DEMYX_WORDPRESS_ALPINE_VERSION
128125
DEMYX_WORDPRESS_VERSION=$DEMYX_WORDPRESS_VERSION
129126
DEMYX_WORDPRESS_BEDROCK_VERSION=$DEMYX_WORDPRESS_BEDROCK_VERSION
130127
DEMYX_WORDPRESS_CLI_VERSION=$DEMYX_WORDPRESS_CLI_VERSION
131-
DEMYX_WORDPRESS_PHP_VERSION=$DEMYX_WORDPRESS_PHP_VERSION
132-
DEMYX_WORDPRESS_PHP_LATEST_VERSION=$DEMYX_WORDPRESS_PHP_LATEST_VERSION" > VERSION
128+
DEMYX_WORDPRESS_PHP_VERSION=$DEMYX_WORDPRESS_PHP_VERSION" > VERSION
133129
- name: Push
134130
run: |
135131
# Not sure why this is being created?
@@ -147,5 +143,3 @@ jobs:
147143
148144
docker push demyx/${{ env.DEMYX_REPOSITORY }}
149145
docker push demyx/${{ env.DEMYX_REPOSITORY }}:bedrock
150-
#docker push demyx/${{ env.DEMYX_REPOSITORY }}:cli
151-
#docker push demyx/${{ env.DEMYX_REPOSITORY }}:7.4

0 commit comments

Comments
 (0)