Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ LLVM=10
CLANG_TOOLS=8
RUST=nightly-2020-04-22
GO=1.12
NODE=11
NODE=14
MAVEN=3.5.4
JDK=8
PANDAS=latest
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ env:
jobs:

docker:
name: AMD64 Debian 10 NodeJS 11
name: AMD64 Debian 10 NodeJS 14
runs-on: ubuntu-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
steps:
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [11]
node: [14]
steps:
- name: Checkout Arrow
uses: actions/checkout@v2
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
# strategy:
# fail-fast: false
# matrix:
# node: [11]
# node: [14]
# steps:
# - name: Checkout Arrow
# uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/conda-integration.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ FROM ${repo}:${arch}-conda-cpp

ARG arch=amd64
ARG maven=3.5
ARG node=11
ARG node=14
ARG jdk=8
ARG go=1.12

Expand Down
2 changes: 1 addition & 1 deletion ci/docker/debian-10-js.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

ARG arch=amd64
ARG node=11
ARG node=14
FROM ${arch}/node:${node}

ENV NODE_NO_WARNINGS=1
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/linux-apt-docs.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN /arrow/ci/scripts/util_download_apache.sh \
ENV PATH=/opt/apache-maven-${maven}/bin:$PATH
RUN mvn -version

ARG node=11
ARG node=14
RUN wget -q -O - https://deb.nodesource.com/setup_${node}.x | bash - && \
apt-get install -y nodejs && \
apt-get clean && \
Expand Down
8 changes: 4 additions & 4 deletions js/gulp/arrow-task.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ const {

const del = require('del');
const gulp = require('gulp');
const { promisify } = require('util');
const mkdirp = require('mkdirp');
const gulpRename = require(`gulp-rename`);
const { memoizeTask } = require('./memoize-task');
const exec = promisify(require('child_process').exec);
const { Observable, ReplaySubject } = require('rxjs');
const pipeline = require('util').promisify(require('stream').pipeline);

const arrowTask = ((cache) => memoizeTask(cache, function copyMain(target) {
const out = targetDir(target);
Expand Down Expand Up @@ -53,8 +53,8 @@ const arrowTask = ((cache) => memoizeTask(cache, function copyMain(target) {

const arrowTSTask = ((cache) => memoizeTask(cache, async function copyTS(target, format) {
const out = targetDir(target, format);
await exec(`mkdirp ${out}`);
await exec(`shx cp -r src/* ${out}`);
await mkdirp(out);
await pipeline(gulp.src(`src/*`), gulp.dest(out));
await del(`${out}/**/*.js`);
}))({});

Expand Down
4 changes: 2 additions & 2 deletions js/gulp/closure-task.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ const {
const fs = require('fs');
const gulp = require('gulp');
const path = require('path');
const mkdirp = require('mkdirp');
const sourcemaps = require('gulp-sourcemaps');
const { memoizeTask } = require('./memoize-task');
const { compileBinFiles } = require('./typescript-task');
const mkdirp = require('util').promisify(require('mkdirp'));
const closureCompiler = require('google-closure-compiler').gulp();

const closureTask = ((cache) => memoizeTask(cache, async function closure(target, format) {
Expand Down Expand Up @@ -93,7 +93,7 @@ const createClosureArgs = (entry_point, externs) => ({
entry_point,
third_party: true,
warning_level: `QUIET`,
dependency_mode: `STRICT`,
dependency_mode: `PRUNE`,
rewrite_polyfills: false,
module_resolution: `NODE`,
// formatting: `PRETTY_PRINT`,
Expand Down
2 changes: 1 addition & 1 deletion js/gulp/test-task.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

const del = require('del');
const path = require('path');
const mkdirp = require('mkdirp');
const { argv } = require('./argv');
const { promisify } = require('util');
const glob = promisify(require('glob'));
const mkdirp = promisify(require('mkdirp'));
const rimraf = promisify(require('rimraf'));
const child_process = require(`child_process`);
const { memoizeTask } = require('./memoize-task');
Expand Down
Loading