Merge branch 'v3' into v4.

inspircd · Dec 23, 2023 · e5829af · e5829af
2 parents 27b79c8 + 17399fc
commit e5829af
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -15,7 +15,7 @@ jobs:
       INSPIRCD_PACKAGES: ${{ matrix.package }} html
       INSPIRCD_REVISION: ${{ github.sha }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Retrieve latest release
         run: |
           echo INSPIRCD_VERSION=$(curl https://api.github.com/repos/inspircd/inspircd/releases | jq --raw-output 'map(select((.draft | not) and (.tag_name | startswith("v4.")))) | first .tag_name | .[1:]') >> $GITHUB_ENV

diff --git a/html/docker.rb b/html/docker.rb
@@ -31,7 +31,7 @@
 output = File.join(INSPIRCD_BUILD_DIR, "index.html")
 File.open(output, "w") do |fh|
 	fh.puts ERB
-		.new(template)
+		.new(template, trim_mode: '<>')
 		.result_with_hash(directory: INSPIRCD_BUILD_DIR, packages: packages)
 end
 FileUtils.chown INSPIRCD_BUILD_USER, INSPIRCD_BUILD_GROUP, output
diff --git a/html/index.rhtml b/html/index.rhtml
@@ -16,6 +16,9 @@ def human_size(file)
 		"#{(bytes / 1_048_576.0).round(2)} MiB"
 	end
 end
+def release_file(files)
+	files.find { |file| file !~ /(?:-dbgsym_|-debug(?:info|source)-|\.src\.)/ }
+end
 %>
 <!DOCTYPE html>
 <html>
@@ -39,6 +42,16 @@ end
 	</head>
 	<body>
 		<h1>InspIRCd Packages</h1>
+			<h2>GitHub Table</h2>
+			<pre>
+Platform                       | File                                     | SHA256
+------------------------------ | ---------------------------------------- | ------
+<% packages.each do |name, files| %>
+<%= name.ljust(30) %> | <%= release_file(files).ljust(40).gsub('~', '.') %> | <%= file_hash(release_file(files)) %>
+
+<% end %>
+			</pre>
+			<hr>
 <% packages.each do |name, files| %>
 			<h2><%= name %></h2>
 			<ul>

diff --git a/rpm/inspircd.spec.in b/rpm/inspircd.spec.in
@@ -81,6 +81,7 @@ mv $RPM_BUILD_ROOT/usr/share/inspircd/logrotate $RPM_BUILD_ROOT/etc/logrotate.d/
 %doc /usr/share/doc/inspircd/sql/log_sql/*
 %doc /usr/share/doc/inspircd/sql/sqloper/*
 /usr/share/inspircd/apparmor
+/usr/share/inspircd/deploy-ssl.sh
 /usr/share/inspircd/inspircd
 /usr/share/man/man1/inspircd.1.gz
 /usr/share/man/man1/inspircd-*.1.gz