From 9bc1beb2c41867876002146dc3e33b73a7e633d2 Mon Sep 17 00:00:00 2001 From: Jan Mrkos Date: Mon, 18 Mar 2024 15:11:55 +0100 Subject: [PATCH 1/6] Remove docs manifest --- docs/Manifest.toml | 104 --------------------------------------------- 1 file changed, 104 deletions(-) delete mode 100644 docs/Manifest.toml diff --git a/docs/Manifest.toml b/docs/Manifest.toml deleted file mode 100644 index 212f3fe..0000000 --- a/docs/Manifest.toml +++ /dev/null @@ -1,104 +0,0 @@ -# This file is machine-generated - editing it directly is not advised - -[[Base64]] -uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" - -[[Dates]] -deps = ["Printf"] -uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" - -[[Distributed]] -deps = ["Random", "Serialization", "Sockets"] -uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" - -[[DocStringExtensions]] -deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "50ddf44c53698f5e784bbebb3f4b21c5807401b1" -uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.3" - -[[Documenter]] -deps = ["Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "3ebb967819b284dc1e3c0422229b58a40a255649" -uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.26.3" - -[[IOCapture]] -deps = ["Logging"] -git-tree-sha1 = "377252859f740c217b936cebcd918a44f9b53b59" -uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89" -version = "0.1.1" - -[[InteractiveUtils]] -deps = ["Markdown"] -uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" - -[[JSON]] -deps = ["Dates", "Mmap", "Parsers", "Unicode"] -git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4" -uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.21.1" - -[[LibGit2]] -deps = ["Printf"] -uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" - -[[Libdl]] -uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" - -[[Logging]] -uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" - -[[Markdown]] -deps = ["Base64"] -uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" - -[[Mmap]] -uuid = "a63ad114-7e13-5084-954f-fe012c677804" - -[[Parsers]] -deps = ["Dates"] -git-tree-sha1 = "223a825cccef2228f3fdbf2ecc7ca93363059073" -uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.0.16" - -[[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] -uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" - -[[Printf]] -deps = ["Unicode"] -uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" - -[[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] -uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" - -[[Random]] -deps = ["Serialization"] -uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" - -[[ReverseGeocode]] -path = ".." -uuid = "96b87e3f-b46e-456c-8178-0e438baab6fa" -version = "0.1.0" - -[[SHA]] -uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" - -[[Serialization]] -uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" - -[[Sockets]] -uuid = "6462fe0b-24de-5631-8697-dd941f90decc" - -[[Test]] -deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] -uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - -[[UUIDs]] -deps = ["Random", "SHA"] -uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" - -[[Unicode]] -uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" From 0857442db31dc6b869ca97b1fb1f989205bd3d44 Mon Sep 17 00:00:00 2001 From: Jan Mrkos Date: Wed, 20 Mar 2024 11:54:11 +0100 Subject: [PATCH 2/6] updated .gitignore with .vscode --- .gitignore | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6c3f089..992dd44 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,13 @@ -*.jl.*.cov -*.jl.cov -*.jl.mem -/docs/build/ +# Package generated files /data/* !country_codes.csv -**Manifest.toml \ No newline at end of file +# Julia generated files +/docs/build/ +**Manifest.toml +*.jl.mem +*.jl.*.cov +*.jl.cov + +# Dev tools +.vscode/ \ No newline at end of file From 2377b5c77f7acc39d8db1f17272065bfd76ff9cd Mon Sep 17 00:00:00 2001 From: Jan Mrkos Date: Wed, 20 Mar 2024 11:54:35 +0100 Subject: [PATCH 3/6] fixed typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5eb07a9..a209918 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Note that due to the requirements of the NearestNeighbors library, the dimension ### Decode Output Customization -The user can also explicitly specify what the decode output as well. The cities data contains other additional headers (e.g., `population`, `admin1`, `modification_date`) that can be included into the output. +The user can also explicitly specify the decode output as well. The cities data contains other additional headers (e.g., `population`, `admin1`, `modification_date`) that can be included into the output. For example, if the user wants population data from the GeoNames cities table: From bf229ac9f2edcde6c7e21c6e6710d6ebfa98bdb0 Mon Sep 17 00:00:00 2001 From: Jan Mrkos Date: Wed, 20 Mar 2024 11:55:05 +0100 Subject: [PATCH 4/6] new version --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 7229598..6ed3952 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ReverseGeocode" uuid = "96b87e3f-b46e-456c-8178-0e438baab6fa" authors = ["Jan Mrkos "] -version = "0.3.4" +version = "4.0.0" [deps] CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" From ee5a14fc3e99f3698172f8c8b97d1b3b9e920488 Mon Sep 17 00:00:00 2001 From: Jan Mrkos Date: Wed, 20 Mar 2024 11:57:18 +0100 Subject: [PATCH 5/6] Getting tagbot ready to trigger documenter --- .github/workflows/TagBot.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/TagBot.yml b/.github/workflows/TagBot.yml index f49313b..631bf98 100644 --- a/.github/workflows/TagBot.yml +++ b/.github/workflows/TagBot.yml @@ -4,6 +4,22 @@ on: types: - created workflow_dispatch: + inputs: + lookback: + default: 3 +permissions: + actions: read + checks: read + contents: write + deployments: read + issues: read + discussions: read + packages: read + pages: read + pull-requests: read + repository-projects: read + security-events: read + statuses: read jobs: TagBot: if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot' @@ -12,4 +28,4 @@ jobs: - uses: JuliaRegistries/TagBot@v1 with: token: ${{ secrets.GITHUB_TOKEN }} - ssh: ${{ secrets.DOCUMENTER_KEY }} + ssh: ${{ secrets.SSH_KEY_ID_ED25519_GITHUB }} \ No newline at end of file From d8cef499eb6a061a487622252141ddf851ea0fd4 Mon Sep 17 00:00:00 2001 From: Jan Mrkos Date: Wed, 20 Mar 2024 14:33:28 +0100 Subject: [PATCH 6/6] Updated CI --- .github/workflows/CI.yml | 63 ++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7da0692..9a9f014 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,7 +1,22 @@ name: CI on: - - push - - pull_request + push: + branches: + - master + tags: '*' + pull_request: + +concurrency: + # Skip intermediate builds: always. + # Cancel intermediate builds: only if it is a pull request build. + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} + +# needed to allow julia-actions/cache to delete old caches that it has created +permissions: + actions: write + contents: read + jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} @@ -9,57 +24,37 @@ jobs: strategy: fail-fast: false matrix: - version: - - '1.5' - - 'nightly' - os: - - ubuntu-latest - - windows-latest + version: ['1', '1.8', 'nightly'] + os: [ubuntu-latest, windows-latest, macOS-latest] arch: - x64 - - x86 + # - aarch64 steps: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v1 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - - uses: actions/cache@v1 - env: - cache-name: cache-artifacts - with: - path: ~/.julia/artifacts - key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }} - restore-keys: | - ${{ runner.os }}-test-${{ env.cache-name }}- - ${{ runner.os }}-test- - ${{ runner.os }}- + - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 + with: + annotate: true - uses: julia-actions/julia-processcoverage@v1 - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v3 with: - file: lcov.info + files: lcov.info docs: name: Documentation + permissions: write-all runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v1 with: version: '1' - - run: | - julia --project=docs -e ' - using Pkg - Pkg.develop(PackageSpec(path=pwd())) - Pkg.instantiate()' - - run: | - julia --project=docs -e ' - using Documenter: DocMeta, doctest - using ReverseGeocode - DocMeta.setdocmeta!(ReverseGeocode, :DocTestSetup, :(using ReverseGeocode); recursive=true) - doctest(ReverseGeocode)' - - run: julia --project=docs docs/make.jl + - uses: julia-actions/julia-buildpkg@v1 + - uses: julia-actions/julia-docdeploy@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} + DOCUMENTER_KEY: ${{ secrets.SSH_KEY_ID_ED25519_GITHUB }} \ No newline at end of file