Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrate to NPM #696

Merged
merged 2 commits into from
Oct 17, 2023
Merged
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
42 changes: 21 additions & 21 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache: npm
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: npm ci
- name: Lint
run: yarn lint
run: npm run lint

test-bundlesize:
name: test bundlesize
Expand All @@ -36,11 +36,11 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache: npm
- name: Install node modules
run: yarn install
run: npm ci
- name: Run tests
run: yarn test:bundlesize
run: npm run test:bundlesize

test-csp-header:
name: test CSP in .htaccess
Expand All @@ -50,11 +50,11 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache: npm
- name: Install node modules
run: yarn install
run: npm ci
- name: Run tests
run: yarn test:csp-header
run: npm run test:csp-header

test-chrome:
name: test against Chrome
Expand All @@ -64,19 +64,19 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache: npm
- name: Install node modules
run: yarn install
run: npm ci
- name: Install chrome browser
run: |
wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
sudo apt install ./google-chrome-stable_current_amd64.deb
- name: Build with test environment
env:
CI: true
run: yarn build --environment test
run: npm run build --environment test
- name: run tests in chrome
run: yarn test:ember --launch Chrome --path dist
run: npm run test:ember --launch Chrome --path dist

test-firefox:
name: test against Firefox
Expand All @@ -86,19 +86,19 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache: npm
- name: Install node modules
run: yarn install
run: npm ci
- name: Setup firefox
uses: browser-actions/setup-firefox@latest
with:
firefox-version: 102.0.1
- name: Build with test environment
env:
CI: true
run: yarn build --environment test
run: npm run build --environment test
- name: run tests in firefox
run: yarn test:ember --launch Firefox --path dist
run: npm run test:ember --launch Firefox --path dist

test-browserstack:
name: test against additional browser in BrowserStack
Expand All @@ -108,13 +108,13 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache: npm
- name: Install node modules
run: yarn install
run: npm ci
- name: Build with test environment
env:
CI: true
run: yarn build --environment test
run: npm run build --environment test
- name: 'BrowserStack Env Setup'
uses: 'browserstack/github-actions/setup-env@master'
with:
Expand All @@ -127,7 +127,7 @@ jobs:
local-logging-level: 'all-logs'
local-identifier: 'random'
- name: 'Running test on BrowserStack'
run: yarn test:ember --config-file testem.browserstack.js --path dist
run: npm run test:ember --config-file testem.browserstack.js --path dist
- name: 'BrowserStackLocal Stop'
uses: browserstack/github-actions/setup-local@master
with:
Expand Down
14 changes: 3 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,7 @@ Croodle is an end-to-end encrypted web application to schedule a date or to do a

This is an alpha version. Changes could brake backward compatibility. It is also not well tested and some features are missing. It is not meant for productive use yet.

<<<<<<< HEAD
Croodle is inspired by [PrivateBin](https://github.com/PrivateBin/PrivateBin) and, of course, by Doodle.
=======
* [Git](https://git-scm.com/)
* [Node.js](https://nodejs.org/)
* [Yarn](https://yarnpkg.com/)
* [Ember CLI](https://cli.emberjs.com/release/)
* [Google Chrome](https://google.com/chrome/)
>>>>>>> e9ac386 (v3.28.6...v4.4.1)

## Security notice

Expand All @@ -39,14 +31,14 @@ Due to security reasons you should have TLS encryption enabled and provide a val

Production builds are provided as github [release assets](https://github.com/jelhan/croodle/releases).

If you like to build yourself you have to install [node](https://nodejs.org/), [yarn](https://yarnpkg.com/), [ember-cli](http://www.ember-cli.com/) and [composer](https://getcomposer.org/) before. It's recommended using [volta](https://volta.sh/) to ensure a compatible and tested node version is used.
If you like to build yourself you have to install [node](https://nodejs.org/), [ember-cli](http://www.ember-cli.com/) and [composer](https://getcomposer.org/) before. It's recommended using [volta](https://volta.sh/) to ensure a compatible and tested node version is used.

```shell
git clone [email protected]:jelhan/croodle.git
cd croodle
yarn install
npm install
cd api/ && composer install --no-dev && cd ..
yarn build --prod
npm run build
```

Afterwards copy all files in `/dist` folder to your werbserver.
Expand Down
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ Once the prep work is completed, the actual release is straight forward:
* First ensure that you have installed the project dependencies:

```sh
yarn install
npm ci
```

* Second, do your release:

```sh
export GITHUB_AUTH="github-personal-access-token"
yarn release
npm run release
```

[release-it](https://github.com/release-it/release-it/) manages the actual
Expand Down
Loading