Skip to content

Commit

Permalink
Merge pull request #177 from artichoke/lopopolo/lock-node-and-dev-tools
Browse files Browse the repository at this point in the history
Lock node, prettier, and @artichokeruby/clang-format
  • Loading branch information
lopopolo authored Dec 31, 2023
2 parents ccc7e52 + ae2d461 commit bd06f8b
Show file tree
Hide file tree
Showing 9 changed files with 319 additions and 20 deletions.
12 changes: 12 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
BasedOnStyle: Google
IndentWidth: 2
ColumnLimit: 100
---
Language: Cpp
PointerAlignment: Right
AlwaysBreakAfterReturnType: TopLevelDefinitions
BreakBeforeBraces: Linux
UseTab: Never
TabWidth: 2
SortIncludes: false
6 changes: 6 additions & 0 deletions .clang-format-ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.git
build
emsdk
node_modules
target
vendor
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,15 @@ updates:
- lopopolo
labels:
- A-deps
- package-ecosystem: npm
directory: "/"
schedule:
interval: monthly
groups:
npm-deps:
patterns:
- "*"
assignees:
- lopopolo
labels:
- A-deps
18 changes: 13 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ jobs:
uses: actions/checkout@v4.1.1

- name: Setup Node.js runtime
uses: actions/setup-node@v4.0.0
uses: actions/setup-node@v4.0.1
with:
node-version: 16
node-version: "lts/*"

- name: Install npm
run: npm i -f -g npm@8.16.0
- name: Install toolchain
run: npm ci

- name: Lint and check formatting with clang-format
run: npx github:artichoke/clang-format --check include
run: npm run fmt:c -- --check

text:
name: Lint and format text
Expand All @@ -150,6 +150,14 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4.1.1

- name: Setup Node.js runtime
uses: actions/setup-node@v4.0.1
with:
node-version: "lts/*"

- name: Install toolchain
run: npm ci

- name: Format with prettier
run: npx prettier --check '**/*'

Expand Down
146 changes: 143 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,145 @@
# Created by https://www.toptal.com/developers/gitignore/api/vim,rust,ruby
# Edit at https://www.toptal.com/developers/gitignore?templates=vim,rust,ruby
# Created by https://www.toptal.com/developers/gitignore/api/vim,ruby,rust,node
# Edit at https://www.toptal.com/developers/gitignore?templates=vim,ruby,rust,node

### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Snowpack dependency directory (https://snowpack.dev/)
web_modules/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional stylelint cache
.stylelintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variable files
.env
.env.development.local
.env.test.local
.env.production.local
.env.local

# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache

# Next.js build output
.next
out

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# vuepress v2.x temp and cache directory
.temp

# Docusaurus cache and generated files
.docusaurus

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port

# Stores VSCode versions used for testing VSCode extensions
.vscode-test

# yarn v2
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*

### Node Patch ###
# Serverless Webpack directories
.webpack/

# Optional stylelint cache

# SvelteKit build / generate output
.svelte-kit

### Ruby ###
*.gem
Expand Down Expand Up @@ -95,7 +235,7 @@ tags
# Persistent undo
[._]*.un~

# End of https://www.toptal.com/developers/gitignore/api/vim,rust,ruby
# End of https://www.toptal.com/developers/gitignore/api/vim,ruby,rust,node

# Overrides

Expand Down
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lts/*
18 changes: 6 additions & 12 deletions include/st.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ typedef unsigned long st_data_t;
#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
typedef unsigned LONG_LONG st_data_t;
#else
#error---->> st.c requires sizeof(void \
*) == sizeof(long) or sizeof(LONG_LONG) to be compiled. <<----
#error---->> st.c requires sizeof(void *) == sizeof(long) or sizeof(LONG_LONG) to be compiled. <<----
#endif
#define ST_DATA_T_DEFINED

Expand Down Expand Up @@ -49,8 +48,7 @@ typedef st_data_t st_index_t;
typedef int st_compare_func(st_data_t, st_data_t);
typedef st_index_t st_hash_func(st_data_t);

typedef char st_check_for_sizeof_st_index_t
[SIZEOF_VOIDP == (int)sizeof(st_index_t) ? 1 : -1];
typedef char st_check_for_sizeof_st_index_t[SIZEOF_VOIDP == (int)sizeof(st_index_t) ? 1 : -1];
#define SIZEOF_ST_INDEX_T SIZEOF_VOIDP

struct st_hash_type {
Expand Down Expand Up @@ -105,21 +103,17 @@ int st_insert(st_table *, st_data_t, st_data_t);
int st_insert2(st_table *, st_data_t, st_data_t, st_data_t (*)(st_data_t));
int st_lookup(st_table *, st_data_t, st_data_t *);
int st_get_key(st_table *, st_data_t, st_data_t *);
typedef int st_update_callback_func(st_data_t *key, st_data_t *value,
st_data_t arg, int existing);
typedef int st_update_callback_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing);
/* *key may be altered, but must equal to the old key, i.e., the
* results of hash() are same and compare() returns 0, otherwise the
* behavior is undefined */
int st_update(st_table *table, st_data_t key, st_update_callback_func *func,
st_data_t arg);
int st_update(st_table *table, st_data_t key, st_update_callback_func *func, st_data_t arg);
int st_foreach(st_table *, int (*)(ANYARGS), st_data_t);
int st_foreach_check(st_table *, int (*)(ANYARGS), st_data_t, st_data_t);
st_index_t st_keys(st_table *table, st_data_t *keys, st_index_t size);
st_index_t st_keys_check(st_table *table, st_data_t *keys, st_index_t size,
st_data_t never);
st_index_t st_keys_check(st_table *table, st_data_t *keys, st_index_t size, st_data_t never);
st_index_t st_values(st_table *table, st_data_t *values, st_index_t size);
st_index_t st_values_check(st_table *table, st_data_t *values, st_index_t size,
st_data_t never);
st_index_t st_values_check(st_table *table, st_data_t *values, st_index_t size, st_data_t never);
void st_add_direct(st_table *, st_data_t, st_data_t);
void st_free_table(st_table *);
void st_cleanup_safe(st_table *, st_data_t);
Expand Down
103 changes: 103 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bd06f8b

Please sign in to comment.