Skip to content

Commit 43d27dd

Browse files
authored
Merge branch 'stable' into platform-logger
2 parents 3851dd3 + 716cee2 commit 43d27dd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+5858
-13232
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: build
22

3-
on: [push, pull_request]
3+
on: [push, pull_request, workflow_dispatch]
44

55
env:
66
REGISTRY: ghcr.io
@@ -19,10 +19,10 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v4
2323

2424
- name: Setup Python
25-
uses: actions/setup-python@v2
25+
uses: actions/setup-python@v5
2626
with:
2727
python-version: 3.x
2828
cache: 'pip'
@@ -56,7 +56,7 @@ jobs:
5656
GITHUB_USER: ${{ github.actor }}
5757
GITHUB_TOKEN: ${{ github.token }}
5858
- name: Upload to crowdin
59-
uses: crowdin/github-action@1.4.6
59+
uses: crowdin/github-action@v2.8.0
6060
if: github.ref_name == 'stable' || startsWith(github.ref_name, 'release-')
6161
with:
6262
crowdin_branch_name: ${{ steps.variables.outputs.version }}
@@ -73,17 +73,17 @@ jobs:
7373
needs: build
7474
steps:
7575
- name: Set up QEMU
76-
uses: docker/setup-qemu-action@v1
76+
uses: docker/setup-qemu-action@v3
7777
- name: Set up Docker Buildx
78-
uses: docker/setup-buildx-action@v1
78+
uses: docker/setup-buildx-action@v3
7979
- name: Login to Registry
80-
uses: docker/login-action@v1
80+
uses: docker/login-action@v3
8181
with:
8282
registry: ${{ env.REGISTRY }}
8383
username: ${{ env.REGISTRY_USER }}
8484
password: ${{ env.REGISTRY_PASSWORD }}
8585
- name: Build and push
86-
uses: docker/build-push-action@v2
86+
uses: docker/build-push-action@v6
8787
with:
8888
push: true
8989
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ needs.build.outputs.version }}
@@ -103,25 +103,25 @@ jobs:
103103
needs: [build, publish-docker]
104104
steps:
105105
- name: Checkout
106-
uses: actions/checkout@v2
106+
uses: actions/checkout@v4
107107
- name: Generate Dockerfile
108108
run: ./deployment/generate-dockerfile.sh
109109
env:
110110
GITHUB_USER: SpongePowered
111111
GITHUB_TOKEN: ${{ github.token }}
112112
VERSIONS: ${{ needs.build.outputs.versions }}
113113
- name: Set up QEMU
114-
uses: docker/setup-qemu-action@v1
114+
uses: docker/setup-qemu-action@v3
115115
- name: Set up Docker Buildx
116-
uses: docker/setup-buildx-action@v1
116+
uses: docker/setup-buildx-action@v3
117117
- name: Login to Registry
118-
uses: docker/login-action@v1
118+
uses: docker/login-action@v3
119119
with:
120120
registry: ${{ env.REGISTRY }}
121121
username: ${{ env.REGISTRY_USER }}
122122
password: ${{ env.REGISTRY_PASSWORD }}
123123
- name: Build and push
124-
uses: docker/build-push-action@v2
124+
uses: docker/build-push-action@v6
125125
with:
126126
push: true
127127
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ ARG CROWDIN_PROJECT_ID
1111
ARG CROWDIN_BASE_URL
1212
ARG VERSION
1313

14-
RUN apk add --no-cache python3 py3-pip bash zip
14+
RUN apk add --no-cache python3 bash zip
15+
16+
ENV VIRTUAL_ENV=/opt/venv
17+
RUN python3 -m venv $VIRTUAL_ENV
18+
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
1519

1620
WORKDIR /app
1721

@@ -37,6 +41,6 @@ RUN export VERSIONS=`list-versions` \
3741

3842
#------- Copy to nginx
3943

40-
FROM nginx:1.19.4-alpine
44+
FROM nginx:1.29.0-alpine
4145

4246
COPY --from=builder /app/dist /usr/share/nginx/html

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The latest version may be viewed in full by visiting [Sponge Docs](https://docs.
77

88
## Contributing
99

10-
Instructions and Guidelines on how to contribute can be found on [the Docs themselves](https://docs.spongepowered.org/en/contributing/spongedocs.html).
10+
Instructions and Guidelines on how to contribute can be found on [the Docs themselves](https://docs.spongepowered.org/stable/en/contributing/spongedocs.html).
1111

1212
## Licensing
1313

@@ -17,7 +17,7 @@ You can read more about our licensing situation on the [documentation itself](ht
1717

1818
## Translations
1919

20-
We're eagerly looking for translators! Please visit the [CrowdIn translation page](https://crowdin.com/project/sponge-docs), sign up, join the team, and start translating.
20+
We're eagerly looking for translators! Please visit the [Crowdin translation page](https://translate.spongepowered.org), sign up, join the team, and start translating.
2121

2222
## Local Environment
2323

gulpfile.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
'use strict';
1+
import { deleteAsync } from 'del'
2+
import gulp from 'gulp'
3+
import pluginerror from 'plugin-error'
4+
import browsersync from 'browser-sync'
5+
import {spawn} from 'child_process'
26

3-
const gulp = require('gulp');
4-
const pluginerror = require('plugin-error');
5-
const browsersync = require('browser-sync').create();
6-
const del = require('del');
7-
const spawn = require('child_process').spawn;
7+
const devServer = browsersync.create();
88

99
function shell(plugin, command, args) {
1010
return (done) =>
@@ -23,7 +23,7 @@ function shell(plugin, command, args) {
2323
}
2424

2525
function webserver(done) {
26-
browsersync.init({
26+
devServer.init({
2727
watch: true,
2828
server: "./build/dev/html/"
2929
}, function () { this.server.on('close', done) })
@@ -34,7 +34,7 @@ function watch() {
3434
gulp.watch('./source/**', gulp.series('sphinx:dev'));
3535
};
3636

37-
gulp.task('clean', () => del(['build']));
37+
gulp.task('clean', () => deleteAsync(['build']));
3838

3939
gulp.task('sphinx', shell(
4040
'sphinx', 'sphinx-build', ['-W', '-d', 'build/doctrees', 'source', 'build/html']

0 commit comments

Comments
 (0)