diff --git a/packages/api/core/src/api/init.ts b/packages/api/core/src/api/init.ts index f880950d5d..2a44df4b9e 100644 --- a/packages/api/core/src/api/init.ts +++ b/packages/api/core/src/api/init.ts @@ -26,7 +26,7 @@ export interface InitOptions { */ interactive?: boolean; /** - * Whether to copy Travis and AppVeyor CI files + * Whether to copy template CI files */ copyCIFiles?: boolean; /** diff --git a/packages/api/core/test/slow/api_spec_slow.ts b/packages/api/core/test/slow/api_spec_slow.ts index a8fa85048e..4b1b63567e 100644 --- a/packages/api/core/test/slow/api_spec_slow.ts +++ b/packages/api/core/test/slow/api_spec_slow.ts @@ -90,7 +90,7 @@ for (const nodeInstaller of ['npm', 'yarn']) { after(() => fs.remove(dir)); }); - describe('init with CI files enabled', () => { + describe.skip('init with CI files enabled', () => { beforeInitTest({ copyCIFiles: true }); it('should copy over the CI config files correctly', async () => { diff --git a/packages/template/base/src/BaseTemplate.ts b/packages/template/base/src/BaseTemplate.ts index 6567b53bee..dd4818e86c 100644 --- a/packages/template/base/src/BaseTemplate.ts +++ b/packages/template/base/src/BaseTemplate.ts @@ -42,7 +42,9 @@ export class BaseTemplate implements ForgeTemplate { d('creating directory:', path.resolve(directory, 'src')); await fs.mkdirs(path.resolve(directory, 'src')); const rootFiles = ['_gitignore', 'forge.config.js']; - if (copyCIFiles) rootFiles.push(...['_travis.yml', '_appveyor.yml']); + if (copyCIFiles) { + d(`Copying CI files is currently not supported - this will be updated in a later version of Forge`); + } const srcFiles = ['index.css', 'index.js', 'index.html', 'preload.js']; for (const file of rootFiles) { diff --git a/packages/template/base/tmpl/_appveyor.yml b/packages/template/base/tmpl/_appveyor.yml deleted file mode 100644 index ed01dd8a0f..0000000000 --- a/packages/template/base/tmpl/_appveyor.yml +++ /dev/null @@ -1,26 +0,0 @@ -platform: - - x64 -environment: - nodejs_version: '8' -cache: - - '%APPDATA%\npm-cache' - - '%USERPROFILE%\.electron' - - node_modules -branches: - only: - - main - - /^v\d+\.\d+\.\d+/ -install: - - ps: Install-Product node $env:nodejs_version $env:platform - - set PATH=%APPDATA%\npm;%PATH% - - npm install - - npm update - -test_script: - - node --version - - npm --version - - npm run lint - - if %APPVEYOR_REPO_TAG% EQU false npm run make - -build_script: - - IF %APPVEYOR_REPO_TAG% EQU true npm run publish diff --git a/packages/template/base/tmpl/_travis.yml b/packages/template/base/tmpl/_travis.yml deleted file mode 100644 index 86937a7f6e..0000000000 --- a/packages/template/base/tmpl/_travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -language: node_js -node_js: '10' -os: - - linux - - osx -dist: bionic -osx_image: xcode10.1 - -cache: - npm: true - yarn: true - directories: - - $HOME/.cache/electron - -addons: - apt: - packages: - - fakeroot - - rpm - -branches: - only: - - master - - /^v\d+\.\d+\.\d+/ - -script: - - npm run lint - - if test -z "$TRAVIS_TAG"; then npm run make; fi -after_success: if test -n "$TRAVIS_TAG"; then npm run publish; fi