Skip to content

Commit

Permalink
v0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@xicilion
xicilion committed Dec 13, 2024
1 parent eba3f46 commit c0308ec
Show file tree
Hide file tree
Showing 3 changed files with 143 additions and 143 deletions.
272 changes: 136 additions & 136 deletions .github/workflows/run-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -1,136 +1,136 @@
name: run ci for fibjs

on:
push:
branches:
- 'ci/**'
- 'ci-**'
- 'releases/**'
- 'feat/**'
- 'bugfix/**'
- 'dev'
- 'master'
- 'test_ci'
tags:
- v*.*.*
- test_github_actions_*
pull_request:
branches:
- 'dev'

jobs:
build:
runs-on: ${{ matrix.os }}
continue-on-error: true
strategy:
matrix:
include:
- os: windows-2019
arch: x64
fibjs: 0.34.0
- os: windows-2019
arch: x64
fibjs: 0.35.0
- os: windows-2019
arch: x64
fibjs: 0.36.0
- os: windows-2019
arch: x64
fibjs: 0.37.0
- os: windows-2019
arch: x86
fibjs: 0.34.0
- os: windows-2019
arch: x86
fibjs: 0.35.0
- os: windows-2019
arch: x86
fibjs: 0.36.0
- os: windows-2019
arch: x86
fibjs: 0.37.0
- os: ubuntu-20.04
arch: x64
fibjs: 0.34.0
- os: ubuntu-20.04
arch: x64
fibjs: 0.35.0
- os: ubuntu-20.04
arch: x64
fibjs: 0.36.0
- os: ubuntu-20.04
arch: x64
fibjs: 0.37.0
- os: ubuntu-20.04
arch: x86
fibjs: 0.34.0
- os: ubuntu-20.04
arch: x86
fibjs: 0.35.0
- os: ubuntu-20.04
arch: x86
fibjs: 0.36.0
- os: ubuntu-20.04
arch: x86
fibjs: 0.37.0
- os: macos-11
arch: x64
fibjs: 0.34.0
- os: macos-11
arch: x64
fibjs: 0.35.0
- os: macos-11
arch: x64
fibjs: 0.36.0
- os: macos-11
arch: x64
fibjs: 0.37.0


steps:
- name: Check out Git repository
uses: actions/checkout@v2
with:
submodules: 'recursive'

- uses: actions/setup-node@v2
with:
node-version: '16'

- name: Set Env Variables
id: set-env-vars
shell: bash
run: |
bash .github/workflows/set-env-vars.sh
env:
ARCH: ${{ matrix.arch }}
OS: ${{ matrix.os }}
FIBJS_VERSION: ${{ matrix.fibjs }}

- name: Install FIBJS
shell: bash
run: |
mkdir -p ./node_modules/.bin;
rm -rf ./node_modules/.bin/fibjs;
. ./.github/workflows/fns.sh --source-only
install_fibjs $FIBJS_VERSION $FIBJS_OS $FIBJS_ARCH;
env:
FIBJS_OS: ${{ steps.set-env-vars.outputs.FIBJS_OS }}
FIBJS_ARCH: ${{ steps.set-env-vars.outputs.FIBJS_ARCH }}
lower_than_0_37_0: ${{ steps.set-env-vars.outputs.lower_than_0_37_0 }}
FIBJS_VERSION: ${{ matrix.fibjs }}

- name: Run CI
shell: bash
run: |
if [[ -f ".github/workflows/run-ci.sh" ]]; then
bash .github/workflows/run-ci.sh;
else
npm install;
npm run ci;
fi
env:
FIBJS_OS: ${{ steps.set-env-vars.outputs.FIBJS_OS }}
GIT_BRANCH: ${{ steps.set-env-vars.outputs.GIT_BRANCH }}
RELEASE_TAG: ${{ steps.set-env-vars.outputs.RELEASE_TAG }}
GIT_TAG: ${{ steps.set-env-vars.outputs.GIT_TAG }}
name: run ci for fibjs

on:
push:
branches:
- 'ci/**'
- 'ci-**'
- 'releases/**'
- 'feat/**'
- 'bugfix/**'
- 'dev'
- 'master'
- 'test_ci'
tags:
- v*.*.*
- test_github_actions_*
pull_request:
branches:
- 'dev'

jobs:
build:
runs-on: ${{ matrix.os }}
continue-on-error: true
strategy:
matrix:
include:
- os: windows-2019
arch: x64
fibjs: 0.34.0
- os: windows-2019
arch: x64
fibjs: 0.35.0
- os: windows-2019
arch: x64
fibjs: 0.36.0
- os: windows-2019
arch: x64
fibjs: 0.37.0
- os: windows-2019
arch: x86
fibjs: 0.34.0
- os: windows-2019
arch: x86
fibjs: 0.35.0
- os: windows-2019
arch: x86
fibjs: 0.36.0
- os: windows-2019
arch: x86
fibjs: 0.37.0
- os: ubuntu-20.04
arch: x64
fibjs: 0.34.0
- os: ubuntu-20.04
arch: x64
fibjs: 0.35.0
- os: ubuntu-20.04
arch: x64
fibjs: 0.36.0
- os: ubuntu-20.04
arch: x64
fibjs: 0.37.0
- os: ubuntu-20.04
arch: x86
fibjs: 0.34.0
- os: ubuntu-20.04
arch: x86
fibjs: 0.35.0
- os: ubuntu-20.04
arch: x86
fibjs: 0.36.0
- os: ubuntu-20.04
arch: x86
fibjs: 0.37.0
- os: macos-11
arch: x64
fibjs: 0.34.0
- os: macos-11
arch: x64
fibjs: 0.35.0
- os: macos-11
arch: x64
fibjs: 0.36.0
- os: macos-11
arch: x64
fibjs: 0.37.0


steps:
- name: Check out Git repository
uses: actions/checkout@v2
with:
submodules: 'recursive'

- uses: actions/setup-node@v2
with:
node-version: '16'

- name: Set Env Variables
id: set-env-vars
shell: bash
run: |
bash .github/workflows/set-env-vars.sh
env:
ARCH: ${{ matrix.arch }}
OS: ${{ matrix.os }}
FIBJS_VERSION: ${{ matrix.fibjs }}

- name: Install FIBJS
shell: bash
run: |
mkdir -p ./node_modules/.bin;
rm -rf ./node_modules/.bin/fibjs;
. ./.github/workflows/fns.sh --source-only
install_fibjs $FIBJS_VERSION $FIBJS_OS $FIBJS_ARCH;
env:
FIBJS_OS: ${{ steps.set-env-vars.outputs.FIBJS_OS }}
FIBJS_ARCH: ${{ steps.set-env-vars.outputs.FIBJS_ARCH }}
lower_than_0_37_0: ${{ steps.set-env-vars.outputs.lower_than_0_37_0 }}
FIBJS_VERSION: ${{ matrix.fibjs }}

- name: Run CI
shell: bash
run: |
if [[ -f ".github/workflows/run-ci.sh" ]]; then
bash .github/workflows/run-ci.sh;
else
npm install;
npm run ci;
fi
env:
FIBJS_OS: ${{ steps.set-env-vars.outputs.FIBJS_OS }}
GIT_BRANCH: ${{ steps.set-env-vars.outputs.GIT_BRANCH }}
RELEASE_TAG: ${{ steps.set-env-vars.outputs.RELEASE_TAG }}
GIT_TAG: ${{ steps.set-env-vars.outputs.GIT_TAG }}
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fib-session",
"version": "0.6.1",
"version": "0.7.0",
"description": "Simple session middleware for fibjs",
"main": "lib/index.js",
"types": "@types/index.d.ts",
Expand Down Expand Up @@ -36,7 +36,7 @@
"dependencies": {
"fib-jws": "^0.4.1",
"fib-kv": "^1.3.1",
"fib-cache": "^1.1.0"
"fib-cache": "^1.2.0"
},
"devDependencies": {
"@fibjs/ci": "^2.7.1",
Expand Down
10 changes: 5 additions & 5 deletions test/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -739,8 +739,8 @@ function session_test(description, opts, test_opts, _before, _after) {
let client_a = new http.Client();
let client_b = new http.Client();

let sid_a = get_value(client_a.get(url.host + 'session'));
let sid_b = get_value(client_b.get(url.host + 'session'));
let sid_a = get_value(client_a.get(url.host + '/session'));
let sid_b = get_value(client_b.get(url.host + '/session'));

let res_a = client_a.get(url.host + '/user?username=lion', {
headers: {
Expand Down Expand Up @@ -821,7 +821,7 @@ function session_test(description, opts, test_opts, _before, _after) {

it('simultaneous set the same session', () => {
let client = new http.Client();
let sid = get_value(client.get(url.host + 'session'));
let sid = get_value(client.get(url.host + '/session'));

let res_a;
setTimeout(() => {
Expand Down Expand Up @@ -884,7 +884,7 @@ function session_test(description, opts, test_opts, _before, _after) {
// req-b get // not updated

let client = new http.Client();
let sid = get_value(client.get(url.host + 'session'));
let sid = get_value(client.get(url.host + '/session'));

let res_a;
setTimeout(() => {
Expand Down Expand Up @@ -1238,7 +1238,7 @@ function session_test(description, opts, test_opts, _before, _after) {
// req-a set @ expire+
// req-b get // not updated
let client = new http.Client();
let sid = get_value(client.get(url.host + 'session'));
let sid = get_value(client.get(url.host + '/session'));
let res_a;
setTimeout(() => {
res_a = client.get(url.host + '/kv?k=username&v=lion', {
Expand Down

0 comments on commit c0308ec

Please sign in to comment.