Skip to content
This repository has been archived by the owner on Jul 10, 2023. It is now read-only.

Commit

Permalink
Rebase from upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
yoavain committed Feb 10, 2023
2 parents 23a7d4d + 7289c5c commit 69de632
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 15 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/nexe-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ jobs:
shell: bash
strategy:
matrix:
os: [windows-latest]
#os: [ubuntu-latest, windows-latest, macos-latest]
# TODO: Bump to windows-latest once it can be solved how to install Python2
# such that the Node.js build system can detect it.
os: [ubuntu-latest, windows-2019, macos-latest]
node_version: ['14.21.2', '16.19.0', '18.14.0', '19.6.0']

steps:
Expand Down Expand Up @@ -63,10 +64,10 @@ jobs:
echo "release_file=$release_file"
echo "release_name=$release_name"
echo "build_occurred=$build_occurred"
echo "::set-output name=release_id::$release_id"
echo "::set-output name=release_file::$release_file"
echo "::set-output name=release_name::$release_name"
echo "::set-output name=build_occurred::$build_occurred"
echo "release_id=$release_id" >> $GITHUB_OUTPUT
echo "release_file=$release_file" >> $GITHUB_OUTPUT
echo "release_name=$release_name" >> $GITHUB_OUTPUT
echo "build_occurred=$build_occurred" >> $GITHUB_OUTPUT
env:
NODE_VERSION: ${{ matrix.node_version }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.14.0
16.19.0
16 changes: 15 additions & 1 deletion RELEASE_LOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
# yoavain/nexe-builds release log

## 0.3.0

* Created on: 2023-02-09
* Nexe version: 4.0.0-rc.2
* Set Linux build to run in version pinned `ghcr.io/urbdyn/centos7-devtoolset8-builder` container which has preinstalled version of `devtoolset-8` package.
* Set Linux build to use Node.js version as defined in `.nvmrc` file.
* Build matrix:
* OS: `linux`, `macos`, `windows`
* Node Version: `14.16.0`, `14.18.0`, `14.18.1`, `16.11.0`, `16.13.0`, `16.13.1`, `16.19.0`, `18.14.0`
* Added `18.14.0` on 2023-02-10.

## 0.2.0

**DEPRECATED 2023-02-09: No known issues but no longer supported.**

* Created on: 2021-10-29
* Nexe version: 4.0.0-beta.19
* Set Linux build to run in Centos7 container and thus require GLIBC version 2.17 instead of 2.25 that is currently in Linux runner.
Expand All @@ -11,8 +24,9 @@
* MacOS resolved on 2021-10-29.
* Build matrix:
* OS: `linux`, `macos`, `windows`
* Node Version: `14.16.0`, `14.18.0`, `14.18.1`, `16.11.0`, `16.13.0`, `16.13.1`
* Node Version: `14.16.0`, `14.18.0`, `14.18.1`, `16.11.0`, `16.13.0`, `16.13.1`, `16.19.0`
* Added `16.13.1` on 2022-01-10.
* Added `16.19.0` on 2023-02-09. (accidentally built with Nexe `4.0.0-rc.2`)

## 0.1.1

Expand Down
8 changes: 3 additions & 5 deletions bin/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
FROM centos:7
# ghcr.io/urbdyn/centos7-devtoolset8-builder from 2023-02-09
FROM ghcr.io/urbdyn/centos7-devtoolset8-builder@sha256:fdb324516c310aead90212f64481d92303c69c5c7815f409c3fc4f61e4b00894

RUN yum install -y which python3 centos-release-scl epel-release
RUN yum install -y ccache devtoolset-8

RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
2 changes: 2 additions & 0 deletions bin/install_dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ case "$os_env" in
"windows")
echo "Installing windows dependencies ..."
set -x
# TODO: Install Python2 such that the Node.js build system can detect it
# on Windows Server 2022.
choco install nasm
set +x
;;
Expand Down
6 changes: 4 additions & 2 deletions bin/run_cd
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if [ "$os_env" = "linux" ]; then
# -v "$HOME/.nexe/:/root/.nexe/" \
docker cp "$repo_dir/package.json" "nexe_build_centos_7_container:/nexe_build/package.json"
docker cp "$repo_dir/package-lock.json" "nexe_build_centos_7_container:/nexe_build/package-lock.json"
docker cp "$repo_dir/.nvmrc" "nexe_build_centos_7_container:/nexe_build/.nvmrc"
echo "Starting docker container build ..."
time docker start -a nexe_build_centos_7_container
echo "Completed docker container build."
Expand All @@ -57,10 +58,11 @@ if [ "$os_env" = "linux" ]; then
else
echo "Installing desired version of node.js ..."
source ~/.bashrc
nvm install "$NODE_VERSION"
cd /nexe_build/
nvm install --no-progress
nvm use
chown -R root:root ~/.nvm/
echo "Running: npm ci"
cd /nexe_build/
npm ci
fi
fi
Expand Down

0 comments on commit 69de632

Please sign in to comment.