Various cleanup (#3)

JuliaServices · Mar 23, 2024 · 0cd7202 · 0cd7202
1 parent 598dcd9
commit 0cd7202
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 136 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - "1.6"
+          - "1.9"
           - "1" # automatically expands to the latest stable 1.x release of Julia
           - nightly
         os:
@@ -52,13 +52,3 @@ jobs:
       - uses: codecov/codecov-action@v1
         with:
           file: lcov.info
-  docs:
-    name: Documentation
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/julia-buildpkg@latest
-      - uses: julia-actions/julia-docdeploy@latest
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
diff --git a/.github/workflows/invalidations.yml b/.github/workflows/invalidations.yml
diff --git a/.github/workflows/previews-cleanup.yml b/.github/workflows/previews-cleanup.yml
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The LibAwsCommon.jl package is licensed under the MIT "Expat" License:
 
-> Copyright (c) 2022: Jacob Quinn
+> Copyright (c) 2024: Jacob Quinn and Ryan Benasutti
 >
 > Permission is hereby granted, free of charge, to any person obtaining
 > a copy of this software and associated documentation files (the

diff --git a/Project.toml b/Project.toml
@@ -9,7 +9,7 @@ aws_c_common_jll = "73048d1d-b8c4-5092-a58d-866c5e8d1e50"
 [compat]
 Aqua = "0.7"
 CEnum = "0.5"
-aws_c_common_jll = "0.9.3"
+aws_c_common_jll = "0.9.14"
 julia = "1.6"
 
 [extras]

diff --git a/README.md b/README.md
@@ -1,8 +1,12 @@
-LibAwsCommon Julia package repo.
+# LibAwsCommon.jl
 
-[![](https://img.shields.io/badge/docs-stable-blue.svg)](https://JuliaLang.github.io/LibAwsCommon.jl/stable)
-[![](https://img.shields.io/badge/docs-dev-blue.svg)](https://JuliaLang.github.io/LibAwsCommon.jl/dev)
+Julia bindings for the [aws-c-common](https://github.com/awslabs/aws-c-common) library.
 
-GitHub Actions : [![Build Status](https://github.com/JuliaLang/LibAwsCommon.jl/workflows/CI/badge.svg)](https://github.com/JuliaLang/LibAwsCommon.jl/actions?query=workflow%3ACI+branch%3Amaster)
+For documentation, please refer to the [lib.jl](https://github.com/JuliaServices/LibAwsCommon.jl/blob/main/src/lib.jl) source file where the original aws documentation is included.
 
-[![codecov.io](http://codecov.io/github/JuliaLang/LibAwsCommon.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaLang/LibAwsCommon.jl?branch=master)
+[![](https://img.shields.io/badge/docs-stable-blue.svg)](https://JuliaServices.github.io/LibAwsCommon.jl/stable)
+[![](https://img.shields.io/badge/docs-dev-blue.svg)](https://JuliaServices.github.io/LibAwsCommon.jl/dev)
+
+GitHub Actions : [![Build Status](https://github.com/JuliaServices/LibAwsCommon.jl/workflows/CI/badge.svg)](https://github.com/JuliaServices/LibAwsCommon.jl/actions?query=workflow%3ACI+branch%3Amaster)
+
+[![codecov.io](http://codecov.io/github/JuliaServices/LibAwsCommon.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaServices/LibAwsCommon.jl?branch=master)
diff --git a/docs/Project.toml b/docs/Project.toml
diff --git a/docs/make.jl b/docs/make.jl
diff --git a/docs/src/index.md b/docs/src/index.md
diff --git a/src/LibAwsCommon.jl b/src/LibAwsCommon.jl
@@ -1,45 +1,17 @@
 module LibAwsCommon
 
 using aws_c_common_jll
-export aws_c_common_jll
 
-const IS_LIBC_MUSL = occursin("musl", Base.BUILD_TRIPLET)
-if Sys.isapple() && Sys.ARCH === :aarch64
-    include("lib.jl")
-elseif Sys.islinux() && Sys.ARCH === :aarch64 && !IS_LIBC_MUSL
-    include("lib.jl")
-elseif Sys.islinux() && Sys.ARCH === :aarch64 && IS_LIBC_MUSL
-    include("lib.jl")
-elseif Sys.islinux() && startswith(string(Sys.ARCH), "arm") && !IS_LIBC_MUSL
-    include("lib.jl")
-elseif Sys.islinux() && startswith(string(Sys.ARCH), "arm") && IS_LIBC_MUSL
-    include("lib.jl")
-elseif Sys.islinux() && Sys.ARCH === :i686 && !IS_LIBC_MUSL
-    include("lib.jl")
-elseif Sys.islinux() && Sys.ARCH === :i686 && IS_LIBC_MUSL
-    include("lib.jl")
-elseif Sys.iswindows() && Sys.ARCH === :i686
+if Sys.iswindows() && Sys.ARCH === :i686
     error("LibAwsCommon.jl does not support i686 windows https://github.com/JuliaPackaging/Yggdrasil/blob/bbab3a916ae5543902b025a4a873cf9ee4a7de68/A/aws_c_common/build_tarballs.jl#L48-L49")
-elseif Sys.islinux() && Sys.ARCH === :powerpc64le
-    include("lib.jl")
-elseif Sys.isapple() && Sys.ARCH === :x86_64
-    include("lib.jl")
-elseif Sys.islinux() && Sys.ARCH === :x86_64 && !IS_LIBC_MUSL
-    include("lib.jl")
-elseif Sys.islinux() && Sys.ARCH === :x86_64 && IS_LIBC_MUSL
-    include("lib.jl")
-elseif Sys.isbsd() && !Sys.isapple()
-    include("lib.jl")
-elseif Sys.iswindows() && Sys.ARCH === :x86_64
-    include("lib.jl")
 else
-    error("Unknown platform: $(Base.BUILD_TRIPLET)")
+    include("lib.jl")
 end
 
 # exports
-const PREFIXES = ["aws_", "AWS_"]
-for name in names(@__MODULE__; all=true), prefix in PREFIXES
-    if startswith(string(name), prefix)
+for name in names(@__MODULE__; all=true)
+    nm = string(name)
+    if startswith(nm, "aws_") || startswith(nm, "AWS_")
         @eval export $name
     end
 end