Skip to content

Commit 8812077

Browse files
HtbaaHtbaa
committed
Merge branch 'release/1.10.6'
2 parents 22f0bb7 + f897fc9 commit 8812077

49 files changed

Lines changed: 19629 additions & 164 deletions

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
2+
name: Build
3+
4+
on:
5+
push:
6+
branches: [ "develop" ]
7+
pull_request:
8+
branches: [ "develop" ]
9+
workflow_dispatch:
10+
11+
jobs:
12+
build:
13+
name: Build
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v3
17+
- name: Use Node.js
18+
uses: actions/setup-node@v3
19+
with:
20+
node-version: 18.x
21+
cache: 'npm'
22+
- name: Install Node.js dependencies
23+
run: npm install
24+
- name: Build Javascript & CSS
25+
env:
26+
# Fix for ERR_OSSL_EVP_UNSUPPORTED error caused by Webpack
27+
NODE_OPTIONS: --openssl-legacy-provider
28+
run: |
29+
npm run css-dev
30+
npm run webpack-dev

‎.github/workflows/release.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
2+
name: Release
3+
4+
on:
5+
push:
6+
tags: [ "*" ]
7+
8+
jobs:
9+
release:
10+
name: Release
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v3
14+
- name: Use Node.js
15+
uses: actions/setup-node@v3
16+
with:
17+
node-version: 18.x
18+
cache: 'npm'
19+
- name: Install Node.js dependencies
20+
run: npm install
21+
- name: Build Javascript & CSS
22+
env:
23+
# Fix for ERR_OSSL_EVP_UNSUPPORTED error caused by Webpack
24+
NODE_OPTIONS: --openssl-legacy-provider
25+
run: |
26+
npm run css-prod
27+
npm run webpack-prod
28+
- name: Cache Composer packages
29+
id: composer-cache
30+
uses: actions/cache@v3
31+
with:
32+
path: vendor
33+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
34+
restore-keys: |
35+
${{ runner.os }}-php-
36+
- name: Install dependencies
37+
working-directory: ./plugins/gh-datainmap
38+
run: composer install --prefer-dist --no-progress
39+
- name: Archive Release
40+
run: |
41+
mkdir -p dist/gh-datainmap
42+
rsync -av ./plugins/gh-datainmap ./dist --exclude 'composer.*'
43+
cp CHANGELOG.md ./dist/gh-datainmap
44+
cd dist
45+
zip -r ../gh-datainmap.zip ./gh-datainmap
46+
- name: Release
47+
uses: fnkr/github-action-ghr@v1
48+
env:
49+
GHR_PATH: gh-datainmap.zip
50+
GHR_REPLACE: true
51+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ node_modules
22
plugins/*
33
plugins/gh-datainmap/dist/*
44
!plugins/gh-datainmap/
5-
package-lock.json
65
dist/*
76
plugins/gh-datainmap/vendor/*
87
!plugins/gh-datainmap/vendor/wp-color-picker-alpha/

plugins/gh-datainmap/CHANGELOG.md renamed to CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
**1.10.6 (2022-07-07)**
2+
3+
- Repository verhuisd naar GitHub. Releases worden nu op GitHub gepubliceerd. Plugin aangepast om hier gebruik van te maken.
4+
15
**1.10.5 (2022-03-24)**
26

37
- Noodzakelijke versiebump vergeten (i.v.m. cachen assets).

‎Dockerfile.node-builder‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM node:16-alpine
2+
3+
WORKDIR /app
4+
VOLUME /app/src
5+
VOLUME /app/plugins/gh-datainmap/dist
6+
7+
RUN apk add --no-cache --virtual .gyp git python3 make g++ libc6-compat
8+
# To handle 'not get uid/gid'
9+
RUN npm config set unsafe-perm true
10+
ADD package*.json ./
11+
RUN npm install
12+
ADD create_archive.js .
13+
ADD webpack.config.js .
14+
COPY src ./src
15+
# --legacy-peer-deps
16+
CMD npm run css-prod && npm run webpack-prod

‎INSTALL.txt‎

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

‎README.md‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Data In Map
2+
3+
[![Build](https://github.com/OpenWebconcept/plugin-datainmap/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/OpenWebconcept/plugin-datainmap/actions/workflows/build.yml)
4+
5+
Data In Map is a WordPress plugin for displaying maps.
6+
7+
## Changelog
8+
9+
A (Dutch) changelog is being kept at `CHANGELOG.MD`
10+
11+
## Install
12+
### For developers
13+
14+
#### Building
15+
16+
````
17+
$ npm install
18+
$ npm run css-prod
19+
$ npm run webpack-prod
20+
$ npm run composer
21+
````
22+
23+
Then, install in a WordPress environment or for local development use the provided `docker-compose.yml` file and run `$ docker-compose up` from the main directory.
24+
25+
#### Updating POT
26+
27+
Using the provided `docker-compose.yml` file run:
28+
29+
`$ docker-compose run --user 33 -e HOME=/tmp --rm wpcli i18n make-pot ./wp-content/plugins/gh-datainmap ./wp-content/plugins/gh-datainmap/languages/gh-datainmap.pot --domain=gh-datainmap --skip-js`
30+
31+
#### Creating a new release
32+
33+
Before tagging a new release make sure the version number is being updated in the following files:
34+
35+
- `package.json`
36+
- `gh-datainmap.php`
37+
- `CHANGELOG.md`
38+
39+
A GitHub Action workflow called Release is being run for every new tag and packages up the distribution file.
40+
41+
### For production
42+
Download a pre-packaged GitHub release. After installation you can follow the configuration steps in the provided documentation (locate it in your WordPress admin menu).

‎create_archive.js‎

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

‎docker-compose.yml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,17 @@ services:
2525
depends_on:
2626
- db
2727
ports:
28-
- 8081:8080
28+
- 8081:8080
29+
wpcli:
30+
image: wordpress:cli
31+
environment:
32+
WORDPRESS_DB_HOST: db:3306
33+
WORDPRESS_DB_PASSWORD: wordpress
34+
WORDPRESS_DB_USER: wordpress
35+
WORDPRESS_DB_NAME: wordpress
36+
volumes_from:
37+
- wordpress
38+
depends_on:
39+
- db
40+
entrypoint: wp
41+
command: "--info"

0 commit comments

Comments
 (0)