Skip to content
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bbaca16
Fix if conditions in release branch merge handler workflow
gfarb Dec 16, 2022
bf31cd9
set fetch depth on checkout in release branch merge handler
gfarb Dec 16, 2022
90e58bb
Merge remote-tracking branch 'origin' into dev
gfarb Dec 19, 2022
4936eba
Upgrade to node 18
gfarb Dec 19, 2022
d0067e1
setup script update to check if SFDX_PLUGINS var is null & updated pa…
gfarb Dec 20, 2022
1de46ec
update if statement to check if SFDX_PLUGINS is not null
gfarb Dec 20, 2022
ef5016d
revert changes to local setup script, update codespace setup script
gfarb Dec 20, 2022
707709b
test changes to codespaces setup script to create unsignedPluginAllow…
gfarb Dec 20, 2022
ec7fce2
nvmrc file, updated package-lock, remove bad file, update setup scrip…
gfarb Dec 21, 2022
f97b641
only remove package-lock if node_modules was cleaned up
gfarb Dec 21, 2022
dd8082f
fix syntax bug in setup script
gfarb Dec 21, 2022
c9481d1
Test fix for unsignedPluginAllowList.json generation
gfarb Dec 21, 2022
5d3c12e
only run plugin logic in setup if there are plugins to install
gfarb Dec 21, 2022
e802209
setup script path cleanup and puppeteer installation for email deliv …
gfarb Dec 21, 2022
27b5ab6
Fix compile release notes and delete artifacts
gfarb Dec 22, 2022
feb671f
Update codespaces setup script to not remove package-lock
gfarb Dec 22, 2022
924b096
remove nvm install and redundant node module installations
gfarb Dec 28, 2022
7b2da16
Only create release.md if it does not already exist
gfarb Dec 28, 2022
994fdbc
Merge remote-tracking branch 'origin/main' into dev
rdietrick Mar 19, 2025
9ec421b
upgrade node version
rdietrick Mar 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
ARG VARIANT=16-bullseye
ARG VARIANT=18-bullseye
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}

# [Optional] Uncomment this section to install additional OS packages.
Expand All @@ -14,6 +14,11 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# ARG EXTRA_NODE_VERSION=10
# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"

# Install nvm
ENV NVM_DIR /usr/local/nvm
RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.20.0/install.sh | bash \
&& . $NVM_DIR/nvm.sh

Comment thread
gfarb marked this conversation as resolved.
Outdated
# [Optional] Uncomment if you want to install more global node modules
# RUN su node -c "npm install -g <your-package-list-here>"
RUN su node -c "npm install -g sfdx-cli"
66 changes: 33 additions & 33 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.162.0/containers/javascript-node
{
"name": "Node.js",
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick a Node version: 10, 12, 14
"args": { "VARIANT": "14" }
},
// Set *default* container specific settings.json values on container create.
// "settings": {},
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"salesforce.salesforcedx-vscode-expanded"
],
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "yarn install",
"postCreateCommand": "bash scripts/codespaces/setup",
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "node",
"features": {
"ghcr.io/devcontainers/features/git:1": {},
"ghcr.io/devcontainers/features/github-cli:1": {},
"ghcr.io/devcontainers/features/java:1": {},
"ghcr.io/devcontainers/features/common-utils:1": {}
}
}
"name": "Node.js",
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick a Node version: 10, 12, 14
"args": { "VARIANT": "18" }
},

// Set *default* container specific settings.json values on container create.
// "settings": {},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"salesforce.salesforcedx-vscode-expanded"
],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "yarn install",
"postCreateCommand": "bash scripts/codespaces/setup",

// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "node",
"features": {
"ghcr.io/devcontainers/features/git:1": {},
"ghcr.io/devcontainers/features/github-cli:1": {},
"ghcr.io/devcontainers/features/java:1": {},
"ghcr.io/devcontainers/features/common-utils:1": {}
}
}
2 changes: 1 addition & 1 deletion .github/workflows/issue-branch-creation-handler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3.5.1
with:
node-version: "14"
node-version-file: ".nvmrc"
- name: Cache node modules
uses: actions/cache@v3.0.11
id: npm_cache_id
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/release-branch-merge-handler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,23 @@ jobs:
- name: Compile Release Notes
if: steps.check_merge.outputs.IS_MERGE == 'true' && vars.GENERATE_RELEASE == 'true'
run: |
if [ls release-notes/${{ vars.ISSUE_BRANCH_PREFIX }}*.md 1> /dev/null 2>&1]
if ls release-notes/${{ vars.ISSUE_BRANCH_PREFIX }}*.md 1> /dev/null 2>&1
then
if [ ! -f $1 ]
then
echo "### Includes the following items" > $1
echo >> $1
fi
echo "### Includes the following items" > 'release-notes/release.md'
echo >> 'release-notes/release.md'
for ISSUE_NOTES in `ls release-notes/${{ vars.ISSUE_BRANCH_PREFIX }}*.md`
do
NOTES=`cat ${ISSUE_NOTES}`
if ! grep -q "${NOTES}" $1
if ! grep -q "${NOTES}" 'release-notes/release.md'
then
echo "${NOTES}" >> $1
echo "${NOTES}" >> 'release-notes/release.md'
fi
done
fi
- name: Delete Artifacts
if: steps.check_merge.outputs.IS_MERGE == 'true'
run: |
if [${{ vars.GENERATE_RELEASE }} == 'true']; then rm release-notes/${{ vars.ISSUE_BRANCH_PREFIX }}*.md || true
if ${{ vars.GENERATE_RELEASE }} == 'true'; then rm release-notes/${{ vars.ISSUE_BRANCH_PREFIX }}*.md || true; fi
rm auth/sandbox-login-url-issue-* || true
- uses: stefanzweifel/git-auto-commit-action@v4.15.4
if: steps.check_merge.outputs.IS_MERGE == 'true'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3.5.1
with:
node-version: "14"
node-version-file: ".nvmrc"
- name: Cache Node Modules
uses: actions/cache@v3.0.11
id: npm_cache_id
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v18.12.1
Loading