Skip to content

Commit ba0d0c6

Browse files
authored
Merge branch 'develop' into clairep/fix_deploy_to_production_trigger
2 parents 167d444 + 9652690 commit ba0d0c6

12 files changed

Lines changed: 709 additions & 77 deletions

File tree

‎.github/workflows/deploy-staging.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ env:
1414
IMAGE: ${{ secrets.DOCKER_USERNAME }}/p5.js-web-editor-staging
1515
jobs:
1616
push_to_registry:
17+
if: ${{ github.event.workflow_run.conclusion == 'success' }}
1718
environment: staging
1819
name: Push Docker image to Docker Hub
1920
runs-on: ubuntu-latest
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Weekly release reminder
2+
3+
on:
4+
# Tuesdays 15:30 UTC
5+
schedule:
6+
- cron: "30 15 * * 2"
7+
workflow_dispatch: {}
8+
9+
permissions:
10+
issues: write
11+
12+
jobs:
13+
remind:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Open release reminder issue
17+
uses: actions/github-script@v7
18+
with:
19+
script: |
20+
await github.rest.issues.create({
21+
owner: context.repo.owner,
22+
repo: context.repo.repo,
23+
title: `Weekly release - ${new Date().toISOString().slice(0, 10)}`,
24+
body: [
25+
"1. Decide on any remaining PRs to merge into `develop`. Check the [Approved Candidates for Release](https://github.com/processing/p5.js-web-editor/pulls?q=is%3Apr+is%3Aopen+review%3Aapproved)",
26+
"2. Review what's merged into `develop` since the last release.",
27+
"3. Decide the version bump (patch/minor/major).",
28+
"4. Run the [Create a release](../actions/workflows/release.yml) workflow with that version.",
29+
"",
30+
"No release needed this week? Just close this issue."
31+
].join("\n")
32+
});

‎.github/workflows/test.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: Test
22

3-
on: [push, pull_request, workflow_call]
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- develop
8+
- release
9+
workflow_call:
410

511
jobs:
612
test:

‎client/modules/IDE/components/FileNode.jsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@ const FileNode = ({
231231
if (!canEdit) {
232232
return;
233233
}
234+
if (!isOptionsOpen) {
235+
fileOptionsRef.current?.focus();
236+
}
234237
setIsOptionsOpen(!isOptionsOpen);
235238
};
236239

‎client/styles/components/_toast.scss‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,32 @@
55
color: getThemifyVariable('toast-text-color');
66
background-color: getThemifyVariable('toast-background-color');
77
}
8-
padding: #{math.div(10, $base-font-size)}rem;
8+
padding: #{math.div(10, $base-font-size)}rem #{math.div(20, $base-font-size)}rem;
99
position: fixed;
10-
top: 0;
10+
top: #{math.div(20, $base-font-size)}rem;
1111
left: 50%;
12-
transform: translate(-50%, 0);
13-
min-width: #{math.div(375, $base-font-size)}rem; //500px
14-
font-size: #{math.div(20, $base-font-size)}rem;
12+
transform: translateX(-50%);
13+
min-width: #{math.div(360, $base-font-size)}rem;
14+
font-size: #{math.div(16, $base-font-size)}rem;
15+
border-radius: #{math.div(8, $base-font-size)}rem;
1516
display: flex;
16-
z-index: 9999;
1717
align-items: center;
1818
justify-content: space-between;
19+
z-index: 9999;
20+
transition: all 0.3s ease-in-out;
1921
box-shadow: 0 6px 6px 0 rgba(0,0,0,0.10);
2022
}
2123

2224
.toast__close {
2325
@include themify() {
2426
@extend %icon-toast;
2527
}
26-
padding-top: #{math.div(10, $base-font-size)}rem;
27-
margin-left: #{math.div(40, $base-font-size)}rem;
28-
}
28+
padding-top: #{math.div(6, $base-font-size)}rem;
29+
margin-left: #{math.div(24, $base-font-size)}rem;
30+
cursor: pointer;
31+
opacity: 0.7;
32+
33+
&:hover {
34+
opacity: 1;
35+
}
36+
}

‎common/p5Versions.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
export const currentP5Version = '2.3.2';
1+
export const currentP5Version = '2.3.4';
22

33
// Generated from https://www.npmjs.com/package/p5?activeTab=versions
44
// Run this in the console:
55
// JSON.stringify([...document.querySelectorAll('._132722c7')].map(n => n.innerText), null, 2)
66
// TODO: use their API for this to grab these at build time?
77
export const p5Versions = [
8-
{ version: '2.3.2', label: '(Latest)' },
8+
{ version: '2.3.4', label: '(Latest)' },
9+
'2.3.2',
10+
'2.3.2',
911
'2.3.1',
1012
'2.3.0',
1113
'2.2.3',

0 commit comments

Comments
 (0)