Skip to content

Commit

Permalink
Merge pull request #65 from add2cal/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
jekuer authored Nov 7, 2023
2 parents 57f7b92 + 4ed6532 commit 45589a1
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ representative at an online or offline event.

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
[INSERT CONTACT METHOD].
[email protected].
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Adhering to the following process is the best way to get your work included in t

```bash
# Clone your fork of the repo
git clone https://github.com/<your-username>/timezones-ical-library.git
git clone https://github.com/add2cal/timezones-ical-library.git
# Navigate to the newly cloned directory
cd add-to-calendar-button
# Assign the original repo to a remote called "upstream"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
registry-url: https://registry.npmjs.org/
cache: 'npm'
- name: npm ci
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,31 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
registry-url: https://registry.npmjs.org/
cache: 'npm'
- run: npm ci
- run: npm test

build-and-publish:
needs: test
runs-on: ubuntu-latest
permissions:
contents: read
id-token: write
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
registry-url: https://registry.npmjs.org/
cache: 'npm'
- run: npm install -g npm
- run: npm ci
- run: npm run build
- run: npm publish
- run: npm publish --provenance
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_SECRET}}
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest]
node-version: ['16']
node-version: ['18', '20']
toolchain: [stable]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Run tests
Expand Down
Binary file modified demo_assets/img/fb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo_assets/img/tw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Add to Calendar TimeZones iCal Library
* ++++++++++++++++++++++++++++++++++++++
*
* Version: 1.7.1
* Version: 1.7.2
* Creator: Jens Kuerschner (https://jenskuerschner.de)
* Project: https://github.com/add2cal/timezones-ical-library
* License: Apache-2.0
Expand Down
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<script async defer data-website-id="df493802-c6d9-49f5-aa67-245f472f5a8e" src="https://a.add-to-calendar-button.com/atcba.js" data-host-url="https://a.add-to-calendar-button.com" data-domains="tz.add-to-calendar-technology.com" data-do-not-track="true"></script>

<!-- load some basic css just for this demo page here -->
<link rel="stylesheet" href="./demo_assets/css/demopage.min.css?v=1.7.1">
<link rel="stylesheet" href="./demo_assets/css/demopage.min.css?v=1.7.2">

</head>
<body>
Expand Down Expand Up @@ -263,15 +263,15 @@ <h3>Background story</h3>
This page is hosted via "GitHub Pages". It includes some very basic analytics, that still preserves your anonymity and does not use any cookies. However, mind that the GitHub privacy policy applies additionally (<a target="_blank" rel="noopener" href="https://docs.github.com/en/github/site-policy/github-privacy-statement">click here for details</a>).
</p>
</div>
<div id="tiny-version">v1.7.1</div>
<div id="tiny-version">v1.7.2</div>

</div>


<!-- js stuff -->
<script type="application/javascript" src="./dist/tzlib.js?v=1.7.1"></script>
<script type="application/javascript" src="./dist/tzlib.js?v=1.7.2"></script>
<script type="application/javascript" src="./demo_assets/js/autocomplete.min.js"></script>
<script type="application/javascript" src="./demo_assets/js/demopage.min.js?v=1.7.1"></script>
<script type="application/javascript" src="./demo_assets/js/demopage.min.js?v=1.7.2"></script>

</body>
</html>
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "timezones-ical-library",
"version": "1.7.1",
"version": "1.7.2",
"engines": {
"node": ">=14.20.0"
},
Expand Down
4 changes: 2 additions & 2 deletions src/tzlib.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
* Add to Calendar TimeZones iCal Library
* ++++++++++++++++++++++++++++++++++++++
*
* Version: 1.7.1
* Version: 1.7.2
* Creator: Jens Kuerschner (https://jenskuerschner.de)
* Project: https://github.com/add2cal/timezones-ical-library
* License: Apache-2.0
*
*/

// eslint-disable-next-line @typescript-eslint/no-unused-vars
const tzlibVersion = '1.7.1';
const tzlibVersion = '1.7.2';

// DEFINING THE DB DATA - WILL GET RE-WRITTEN WITH THE ACTUAL DATA ON BUILD
let tzlibZonesDB,
Expand Down

0 comments on commit 45589a1

Please sign in to comment.